Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace generated Archtest by TechnicalStructureTest #17521

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generators/server/__snapshots__/generator.spec.mjs.snap
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ Object {
"path": "src/test/java/",
"templates": Array [
Object {
"file": "package/ArchTest.java",
"file": "package/TechnicalStructureTest.java",
"renameTo": [Function],
},
],
Expand Down
4 changes: 2 additions & 2 deletions generators/server/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,8 @@ const baseServerFiles = {
path: SERVER_TEST_SRC_DIR,
templates: [
{
file: 'package/ArchTest.java',
renameTo: generator => `${generator.testDir}ArchTest.java`,
file: 'package/TechnicalStructureTest.java',
renameTo: generator => `${generator.testDir}TechnicalStructureTest.java`,
},
],
},
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<%#
Copyright 2013-2022 the original author or authors from the JHipster project.

This file is part of the JHipster project, see https://www.jhipster.tech/
for more information.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-%>
package <%= packageName %>;

import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
import com.tngtech.archunit.junit.AnalyzeClasses;
import com.tngtech.archunit.junit.ArchTest;
import com.tngtech.archunit.lang.ArchRule;

import static com.tngtech.archunit.base.DescribedPredicate.alwaysTrue;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.belongToAnyOf;
import static com.tngtech.archunit.library.Architectures.layeredArchitecture;

@AnalyzeClasses(packagesOf = <%= mainClass %>.class, importOptions = DoNotIncludeTests.class)
class TechnicalStructureTest {

@ArchTest
static final ArchRule respectsTechnicalArchitectureLayers = layeredArchitecture()
.layer("Config").definedBy("..config..")
.layer("Web").definedBy("..web..")
.layer("Service").definedBy("..service..")
.layer("Security").definedBy("..security..")
.layer("Persistence").definedBy("..repository..")
.layer("Domain").definedBy("..domain..")

.whereLayer("Config").mayNotBeAccessedByAnyLayer()
.whereLayer("Web").mayOnlyBeAccessedByLayers("Config")
.whereLayer("Service").mayOnlyBeAccessedByLayers("Web", "Config")
.whereLayer("Security").mayOnlyBeAccessedByLayers("Web", "Service", "Config")
.whereLayer("Persistence").mayOnlyBeAccessedByLayers("Service", "Security", "Web", "Config")
.whereLayer("Domain").mayOnlyBeAccessedByLayers("Persistence", "Service", "Security", "Web", "Config")

.ignoreDependency(belongToAnyOf(<%= mainClass %>.class), alwaysTrue());
}
4 changes: 2 additions & 2 deletions test/__snapshots__/app-client-custom-path.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1223,10 +1223,10 @@ Object {
"src/main/webapp2/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down
52 changes: 26 additions & 26 deletions test/__snapshots__/app.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@ Object {
"src/main/resources/templates/mail/passwordResetEmail.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -799,10 +799,10 @@ Object {
"src/main/resources/templates/mail/passwordResetEmail.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -3053,10 +3053,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -4393,10 +4393,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -5730,10 +5730,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -7061,10 +7061,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -8407,10 +8407,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -9774,10 +9774,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -10718,10 +10718,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -12067,10 +12067,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -13365,10 +13365,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -14681,10 +14681,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -16042,10 +16042,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/server.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,10 @@ Object {
"src/main/webapp/i18n/fr/user-management.json": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down
8 changes: 4 additions & 4 deletions test/blueprint/__snapshots__/app-blueprint.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1223,10 +1223,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down Expand Up @@ -2569,10 +2569,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down
4 changes: 2 additions & 2 deletions test/blueprint/__snapshots__/scoped-blueprint.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1223,10 +1223,10 @@ Object {
"src/main/webapp/swagger-ui/index.html": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/ArchTest.java": Object {
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
"src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {
Expand Down