Skip to content

Commit

Permalink
Merge branch '4.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nvoxland
nvoxland committed Oct 6, 2020
2 parents c1da538 + 037bcfe commit 43ed0e5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions liquibase-core/src/test/groovy/liquibase/resource/ClassLoaderResourceAccessorTest.groovy
View file
Expand Up @@ -87,6 +87,7 @@ class ClassLoaderResourceAccessorTest extends Specification {
"com/example/everywhere",
"com/example/everywhere/file-everywhere.txt",
"com/example/everywhere/other-file-everywhere.txt",
"com/example/file with space.txt",
"com/example/file-in-jar.txt",
"com/example/file-in-zip.txt",
"com/example/jar",
Expand Down Expand Up @@ -114,6 +115,7 @@ class ClassLoaderResourceAccessorTest extends Specification {
null, "com/example", false, true, true,
[
"com/example/everywhere",
"com/example/file with space.txt",
"com/example/file-in-jar.txt",
"com/example/file-in-zip.txt",
"com/example/jar",
Expand All @@ -127,6 +129,7 @@ class ClassLoaderResourceAccessorTest extends Specification {
[
null, "com/example", false, true, false,
[
"com/example/file with space.txt",
"com/example/file-in-jar.txt",
"com/example/file-in-zip.txt",
"com/example/my-logic.sql",
Expand Down
10 changes: 5 additions & 5 deletions liquibase-core/src/test/groovy/liquibase/resource/FileSystemResourceAccessorTest.groovy
View file
Expand Up @@ -153,12 +153,12 @@ class FileSystemResourceAccessorTest extends Specification {
where:
relativeTo | path | recursive | includeFiles | includeDirectories | expected
null | "com/example" | false | true | false | ["com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/my-logic.sql", "com/example/users.csv"]
"com" | "example" | false | true | false | ["com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/my-logic.sql", "com/example/users.csv"]
null | "com/example" | false | true | false | ["com/example/file with space.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/my-logic.sql", "com/example/users.csv"]
"com" | "example" | false | true | false | ["com/example/file with space.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/my-logic.sql", "com/example/users.csv"]
"com/example/users.csv" | "everywhere" | false | true | false | ["com/example/everywhere/file-everywhere.txt", "com/example/everywhere/other-file-everywhere.txt"]
null | "com/example" | false | true | true | ["com/example/everywhere", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar", "com/example/liquibase", "com/example/my-logic.sql", "com/example/shared", "com/example/users.csv", "com/example/zip"]
null | "com/example" | true | true | true | ["com/example/everywhere", "com/example/everywhere/file-everywhere.txt", "com/example/everywhere/other-file-everywhere.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar", "com/example/jar/file-in-jar.txt", "com/example/liquibase", "com/example/liquibase/change", "com/example/liquibase/change/ColumnConfig.class", "com/example/liquibase/change/ComputedConfig.class", "com/example/liquibase/change/CreateTableExampleChange.class", "com/example/liquibase/change/DefaultConstraintConfig.class", "com/example/liquibase/change/IdentityConfig.class", "com/example/liquibase/change/KeyColumnConfig.class", "com/example/liquibase/change/PrimaryKeyConfig.class", "com/example/liquibase/change/UniqueConstraintConfig.class", "com/example/my-logic.sql", "com/example/shared", "com/example/shared/file-in-jar.txt", "com/example/shared/file-in-zip.txt", "com/example/users.csv", "com/example/zip", "com/example/zip/file-in-zip.txt"]
null | "com/example" | true | true | false | ["com/example/everywhere/file-everywhere.txt", "com/example/everywhere/other-file-everywhere.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar/file-in-jar.txt", "com/example/liquibase/change/ColumnConfig.class", "com/example/liquibase/change/ComputedConfig.class", "com/example/liquibase/change/CreateTableExampleChange.class", "com/example/liquibase/change/DefaultConstraintConfig.class", "com/example/liquibase/change/IdentityConfig.class", "com/example/liquibase/change/KeyColumnConfig.class", "com/example/liquibase/change/PrimaryKeyConfig.class", "com/example/liquibase/change/UniqueConstraintConfig.class", "com/example/my-logic.sql", "com/example/shared/file-in-jar.txt", "com/example/shared/file-in-zip.txt", "com/example/users.csv", "com/example/zip/file-in-zip.txt"]
null | "com/example" | false | true | true | ["com/example/everywhere", "com/example/file with space.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar", "com/example/liquibase", "com/example/my-logic.sql", "com/example/shared", "com/example/users.csv", "com/example/zip"]
null | "com/example" | true | true | true | ["com/example/everywhere", "com/example/everywhere/file-everywhere.txt", "com/example/everywhere/other-file-everywhere.txt", "com/example/file with space.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar", "com/example/jar/file-in-jar.txt", "com/example/liquibase", "com/example/liquibase/change", "com/example/liquibase/change/ColumnConfig.class", "com/example/liquibase/change/ComputedConfig.class", "com/example/liquibase/change/CreateTableExampleChange.class", "com/example/liquibase/change/DefaultConstraintConfig.class", "com/example/liquibase/change/IdentityConfig.class", "com/example/liquibase/change/KeyColumnConfig.class", "com/example/liquibase/change/PrimaryKeyConfig.class", "com/example/liquibase/change/UniqueConstraintConfig.class", "com/example/my-logic.sql", "com/example/shared", "com/example/shared/file-in-jar.txt", "com/example/shared/file-in-zip.txt", "com/example/users.csv", "com/example/zip", "com/example/zip/file-in-zip.txt"]
null | "com/example" | true | true | false | ["com/example/everywhere/file-everywhere.txt", "com/example/everywhere/other-file-everywhere.txt", "com/example/file with space.txt", "com/example/file-in-jar.txt", "com/example/file-in-zip.txt", "com/example/jar/file-in-jar.txt", "com/example/liquibase/change/ColumnConfig.class", "com/example/liquibase/change/ComputedConfig.class", "com/example/liquibase/change/CreateTableExampleChange.class", "com/example/liquibase/change/DefaultConstraintConfig.class", "com/example/liquibase/change/IdentityConfig.class", "com/example/liquibase/change/KeyColumnConfig.class", "com/example/liquibase/change/PrimaryKeyConfig.class", "com/example/liquibase/change/UniqueConstraintConfig.class", "com/example/my-logic.sql", "com/example/shared/file-in-jar.txt", "com/example/shared/file-in-zip.txt", "com/example/users.csv", "com/example/zip/file-in-zip.txt"]
null | "com/example" | true | false | true | ["com/example/everywhere", "com/example/jar", "com/example/liquibase", "com/example/liquibase/change", "com/example/shared", "com/example/zip"]
null | "com/example" | true | false | false | []
null | "com/example" | false | false | false | []
Expand Down

0 comments on commit 43ed0e5

Please sign in to comment.