Skip to content

Commit

Permalink
Merge pull request #16859 from ia3andy/fix-snap-dir-tree-sort
Browse files Browse the repository at this point in the history 
Sort dir-tree.snapshot to avoid unnecessary updates
  • Loading branch information
@gastaldi
gastaldi authored Apr 28, 2021
2 parents 8476ee6 + 090ffcf commit 302475b
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 155 deletions.
1 change: 1 addition & 0 deletions ...cts/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public static ListAssert<String> assertThatDirectoryTreeMatchSnapshots(String sn
}
return r;
})
.sorted()
.collect(toList());

final boolean updateSnapshot = shouldUpdateSnapshot(snapshotName);
Expand Down
62 changes: 31 additions & 31 deletions ...pshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
/
runtime/
runtime/pom.xml
runtime/src/
runtime/src/main/
runtime/src/main/resources/
runtime/src/main/resources/META-INF/
runtime/src/main/resources/META-INF/quarkus-extension.yaml
deployment/
deployment/pom.xml
deployment/src/
deployment/src/main/
deployment/src/main/java/
deployment/src/main/java/org/
deployment/src/main/java/org/extension/
deployment/src/main/java/org/extension/deployment/
deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
deployment/src/test/
deployment/src/test/java/
deployment/src/test/java/org/
deployment/src/test/java/org/extension/
deployment/src/test/java/org/extension/test/
deployment/src/test/java/org/extension/test/MyExtensionDevModeTest.java
deployment/src/test/java/org/extension/test/MyExtensionTest.java
integration-tests/
integration-tests/pom.xml
integration-tests/src/
integration-tests/src/main/
integration-tests/src/main/java/
integration-tests/src/main/java/org/
integration-tests/src/main/java/org/extension/
integration-tests/src/main/java/org/extension/it/
integration-tests/src/main/java/org/extension/it/MyExtensionResource.java
integration-tests/src/main/resources/
integration-tests/src/main/resources/application.properties
integration-tests/src/test/
integration-tests/src/test/java/
integration-tests/src/test/java/org/
integration-tests/src/test/java/org/extension/
integration-tests/src/test/java/org/extension/it/
integration-tests/src/test/java/org/extension/it/MyExtensionResourceTest.java
integration-tests/src/test/java/org/extension/it/NativeMyExtensionResourceIT.java
integration-tests/src/main/
integration-tests/src/main/resources/
integration-tests/src/main/resources/application.properties
integration-tests/src/main/java/
integration-tests/src/main/java/org/
integration-tests/src/main/java/org/extension/
integration-tests/src/main/java/org/extension/it/
integration-tests/src/main/java/org/extension/it/MyExtensionResource.java
pom.xml
deployment/
deployment/pom.xml
deployment/src/
deployment/src/test/
deployment/src/test/java/
deployment/src/test/java/org/
deployment/src/test/java/org/extension/
deployment/src/test/java/org/extension/test/
deployment/src/test/java/org/extension/test/MyExtensionDevModeTest.java
deployment/src/test/java/org/extension/test/MyExtensionTest.java
deployment/src/main/
deployment/src/main/java/
deployment/src/main/java/org/
deployment/src/main/java/org/extension/
deployment/src/main/java/org/extension/deployment/
deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
runtime/
runtime/pom.xml
runtime/src/
runtime/src/main/
runtime/src/main/resources/
runtime/src/main/resources/META-INF/
runtime/src/main/resources/META-INF/quarkus-extension.yaml
18 changes: 9 additions & 9 deletions ...s__/QuarkusExtensionCodestartGenerationTest/generateProjectWithoutTests/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
/
runtime/
runtime/pom.xml
runtime/src/
runtime/src/main/
runtime/src/main/resources/
runtime/src/main/resources/META-INF/
runtime/src/main/resources/META-INF/quarkus-extension.yaml
pom.xml
deployment/
deployment/pom.xml
deployment/src/
Expand All @@ -15,4 +7,12 @@ deployment/src/main/java/
deployment/src/main/java/org/
deployment/src/main/java/org/extension/
deployment/src/main/java/org/extension/deployment/
deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
pom.xml
runtime/
runtime/pom.xml
runtime/src/
runtime/src/main/
runtime/src/main/resources/
runtime/src/main/resources/META-INF/
runtime/src/main/resources/META-INF/quarkus-extension.yaml
2 changes: 1 addition & 1 deletion ..._snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.gitignore
/
README.md
jbang
.gitignore
jbang.cmd
src/
src/GreetingResource.java
2 changes: 1 addition & 1 deletion ..._snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.gitignore
/
README.md
jbang
.gitignore
jbang.cmd
src/
src/GreetingCommand.java
54 changes: 27 additions & 27 deletions ...t/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,9 @@
/
pom.xml
integration-tests/
integration-tests/my-ext/
integration-tests/my-ext/pom.xml
integration-tests/my-ext/src/
integration-tests/my-ext/src/main/
integration-tests/my-ext/src/main/resources/
integration-tests/my-ext/src/main/resources/application.properties
integration-tests/my-ext/src/main/java/
integration-tests/my-ext/src/main/java/org/
integration-tests/my-ext/src/main/java/org/acme/
integration-tests/my-ext/src/main/java/org/acme/my/
integration-tests/my-ext/src/main/java/org/acme/my/ext/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/MyExtResource.java
integration-tests/my-ext/src/test/
integration-tests/my-ext/src/test/java/
integration-tests/my-ext/src/test/java/org/
integration-tests/my-ext/src/test/java/org/acme/
integration-tests/my-ext/src/test/java/org/acme/my/
integration-tests/my-ext/src/test/java/org/acme/my/ext/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/NativeMyExtResourceIT.java
integration-tests/pom.xml
bom/
bom/application/
bom/application/pom.xml
extensions/
extensions/my-ext/
extensions/my-ext/pom.xml
extensions/my-ext/deployment/
extensions/my-ext/deployment/pom.xml
extensions/my-ext/deployment/src/
Expand All @@ -50,11 +24,37 @@ extensions/my-ext/deployment/src/test/java/org/acme/my/ext/
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
extensions/my-ext/pom.xml
extensions/my-ext/runtime/
extensions/my-ext/runtime/pom.xml
extensions/my-ext/runtime/src/
extensions/my-ext/runtime/src/main/
extensions/my-ext/runtime/src/main/resources/
extensions/my-ext/runtime/src/main/resources/META-INF/
extensions/my-ext/runtime/src/main/resources/META-INF/quarkus-extension.yaml
extensions/pom.xml
extensions/pom.xml
integration-tests/
integration-tests/my-ext/
integration-tests/my-ext/pom.xml
integration-tests/my-ext/src/
integration-tests/my-ext/src/main/
integration-tests/my-ext/src/main/java/
integration-tests/my-ext/src/main/java/org/
integration-tests/my-ext/src/main/java/org/acme/
integration-tests/my-ext/src/main/java/org/acme/my/
integration-tests/my-ext/src/main/java/org/acme/my/ext/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/MyExtResource.java
integration-tests/my-ext/src/main/resources/
integration-tests/my-ext/src/main/resources/application.properties
integration-tests/my-ext/src/test/
integration-tests/my-ext/src/test/java/
integration-tests/my-ext/src/test/java/org/
integration-tests/my-ext/src/test/java/org/acme/
integration-tests/my-ext/src/test/java/org/acme/my/
integration-tests/my-ext/src/test/java/org/acme/my/ext/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/NativeMyExtResourceIT.java
integration-tests/pom.xml
pom.xml
54 changes: 27 additions & 27 deletions ...pshots__/CreateExtensionMojoIT/testCreateCoreExtensionFromExtensionsDir/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,9 @@
/
pom.xml
integration-tests/
integration-tests/my-ext/
integration-tests/my-ext/pom.xml
integration-tests/my-ext/src/
integration-tests/my-ext/src/main/
integration-tests/my-ext/src/main/resources/
integration-tests/my-ext/src/main/resources/application.properties
integration-tests/my-ext/src/main/java/
integration-tests/my-ext/src/main/java/org/
integration-tests/my-ext/src/main/java/org/acme/
integration-tests/my-ext/src/main/java/org/acme/my/
integration-tests/my-ext/src/main/java/org/acme/my/ext/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/MyExtResource.java
integration-tests/my-ext/src/test/
integration-tests/my-ext/src/test/java/
integration-tests/my-ext/src/test/java/org/
integration-tests/my-ext/src/test/java/org/acme/
integration-tests/my-ext/src/test/java/org/acme/my/
integration-tests/my-ext/src/test/java/org/acme/my/ext/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/NativeMyExtResourceIT.java
integration-tests/pom.xml
bom/
bom/application/
bom/application/pom.xml
extensions/
extensions/my-ext/
extensions/my-ext/pom.xml
extensions/my-ext/deployment/
extensions/my-ext/deployment/pom.xml
extensions/my-ext/deployment/src/
Expand All @@ -50,11 +24,37 @@ extensions/my-ext/deployment/src/test/java/org/acme/my/ext/
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
extensions/my-ext/pom.xml
extensions/my-ext/runtime/
extensions/my-ext/runtime/pom.xml
extensions/my-ext/runtime/src/
extensions/my-ext/runtime/src/main/
extensions/my-ext/runtime/src/main/resources/
extensions/my-ext/runtime/src/main/resources/META-INF/
extensions/my-ext/runtime/src/main/resources/META-INF/quarkus-extension.yaml
extensions/pom.xml
extensions/pom.xml
integration-tests/
integration-tests/my-ext/
integration-tests/my-ext/pom.xml
integration-tests/my-ext/src/
integration-tests/my-ext/src/main/
integration-tests/my-ext/src/main/java/
integration-tests/my-ext/src/main/java/org/
integration-tests/my-ext/src/main/java/org/acme/
integration-tests/my-ext/src/main/java/org/acme/my/
integration-tests/my-ext/src/main/java/org/acme/my/ext/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/
integration-tests/my-ext/src/main/java/org/acme/my/ext/it/MyExtResource.java
integration-tests/my-ext/src/main/resources/
integration-tests/my-ext/src/main/resources/application.properties
integration-tests/my-ext/src/test/
integration-tests/my-ext/src/test/java/
integration-tests/my-ext/src/test/java/org/
integration-tests/my-ext/src/test/java/org/acme/
integration-tests/my-ext/src/test/java/org/acme/my/
integration-tests/my-ext/src/test/java/org/acme/my/ext/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java
integration-tests/my-ext/src/test/java/org/acme/my/ext/it/NativeMyExtResourceIT.java
integration-tests/pom.xml
pom.xml
68 changes: 34 additions & 34 deletions ...rces/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/dir-tree.snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,18 @@
/
quarkus-my-quarki-ext/
quarkus-my-quarki-ext/README.md
quarkus-my-quarki-ext/LICENSE
quarkus-my-quarki-ext/pom.xml
quarkus-my-quarki-ext/integration-tests/
quarkus-my-quarki-ext/integration-tests/pom.xml
quarkus-my-quarki-ext/integration-tests/src/
quarkus-my-quarki-ext/integration-tests/src/main/
quarkus-my-quarki-ext/integration-tests/src/main/resources/
quarkus-my-quarki-ext/integration-tests/src/main/resources/application.properties
quarkus-my-quarki-ext/integration-tests/src/main/java/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResource.java
quarkus-my-quarki-ext/integration-tests/src/test/
quarkus-my-quarki-ext/integration-tests/src/test/java/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResourceTest.java
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/NativeMyQuarkiExtResourceIT.java
quarkus-my-quarki-ext/.github/
quarkus-my-quarki-ext/.github/dependabot.yml
quarkus-my-quarki-ext/.github/project.yml
quarkus-my-quarki-ext/.github/release/
quarkus-my-quarki-ext/.github/release/maven-settings.xml.gpg
quarkus-my-quarki-ext/.github/project.yml
quarkus-my-quarki-ext/.github/workflows/
quarkus-my-quarki-ext/.github/workflows/quarkus-snapshot.yaml
quarkus-my-quarki-ext/.github/workflows/build.yml
quarkus-my-quarki-ext/.github/workflows/pre-release.yml
quarkus-my-quarki-ext/.github/workflows/quarkus-snapshot.yaml
quarkus-my-quarki-ext/.github/workflows/release.yml
quarkus-my-quarki-ext/.github/dependabot.yml
quarkus-my-quarki-ext/.gitignore
quarkus-my-quarki-ext/LICENSE
quarkus-my-quarki-ext/README.md
quarkus-my-quarki-ext/deployment/
quarkus-my-quarki-ext/deployment/pom.xml
quarkus-my-quarki-ext/deployment/src/
Expand All @@ -57,17 +33,41 @@ quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/MyQuarkiExtTest.java
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/MyQuarkiExtDevModeTest.java
quarkus-my-quarki-ext/.gitignore
quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/MyQuarkiExtTest.java
quarkus-my-quarki-ext/docs/
quarkus-my-quarki-ext/docs/antora.yml
quarkus-my-quarki-ext/docs/modules/
quarkus-my-quarki-ext/docs/modules/ROOT/
quarkus-my-quarki-ext/docs/modules/ROOT/nav.adoc
quarkus-my-quarki-ext/docs/modules/ROOT/pages/
quarkus-my-quarki-ext/docs/modules/ROOT/pages/index.adoc
quarkus-my-quarki-ext/docs/modules/ROOT/pages/config.adoc
quarkus-my-quarki-ext/docs/antora.yml
quarkus-my-quarki-ext/docs/modules/ROOT/pages/index.adoc
quarkus-my-quarki-ext/integration-tests/
quarkus-my-quarki-ext/integration-tests/pom.xml
quarkus-my-quarki-ext/integration-tests/src/
quarkus-my-quarki-ext/integration-tests/src/main/
quarkus-my-quarki-ext/integration-tests/src/main/java/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/
quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResource.java
quarkus-my-quarki-ext/integration-tests/src/main/resources/
quarkus-my-quarki-ext/integration-tests/src/main/resources/application.properties
quarkus-my-quarki-ext/integration-tests/src/test/
quarkus-my-quarki-ext/integration-tests/src/test/java/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResourceTest.java
quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/NativeMyQuarkiExtResourceIT.java
quarkus-my-quarki-ext/pom.xml
quarkus-my-quarki-ext/runtime/
quarkus-my-quarki-ext/runtime/pom.xml
quarkus-my-quarki-ext/runtime/src/
Expand Down
Loading

0 comments on commit 302475b

Please sign in to comment.