Skip to content

Add architecture tests. #1754

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.

Sign up for GitHub

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

Open
fduminy wants to merge 5 commits into
base: 3.x
Choose a base branch
from
Open

Add architecture tests. #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1b8b55
Add architecture tests.
fduminy Jan 12, 2020
4ddaa92
code review
fduminy Feb 1, 2020
6887372
Simplify ArchitectureTest and freeze (until there are fixed) violated…
fduminy Feb 1, 2020
301921b
Freeze more architecture rule violations after rebase
fduminy Feb 1, 2020
962e74d
Merge branch 'master' into architecture_test
fduminy Feb 15, 2020
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
15 changes: 15 additions & 0 deletions archunit_store/a7253140-a775-4d8b-8f63-e57ad212fdea
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Constructor <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.<init>()> calls method <org.assertj.core.internal.TypeComparators.defaultTypeComparators()> in (RecursiveComparisonConfiguration.java:59)
Field <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.typeComparators> has type <org.assertj.core.internal.TypeComparators> in (RecursiveComparisonConfiguration.java:0)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.comparatorByTypes()> calls method <org.assertj.core.internal.TypeComparators.comparatorByTypes()> in (RecursiveComparisonConfiguration.java:91)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.describeComparatorForTypes(java.lang.StringBuilder)> calls method <org.assertj.core.internal.TypeComparators.comparatorByTypes()> in (RecursiveComparisonConfiguration.java:530)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.describeRegisteredComparatorByTypes(java.lang.StringBuilder)> calls method <org.assertj.core.internal.TypeComparators.isEmpty()> in (RecursiveComparisonConfiguration.java:523)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.describeRegisteredComparatorForFields(java.lang.StringBuilder)> calls method <org.assertj.core.internal.TypeComparators.isEmpty()> in (RecursiveComparisonConfiguration.java:543)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.getComparatorForType(java.lang.Class)> calls method <org.assertj.core.internal.TypeComparators.get(java.lang.Class)> in (RecursiveComparisonConfiguration.java:83)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.getNonIgnoredActualFieldNames(org.assertj.core.api.recursive.comparison.DualValue)> calls method <org.assertj.core.internal.Objects.getFieldsNames(java.lang.Class)> in (RecursiveComparisonConfiguration.java:387)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.getTypeComparators()> has return type <org.assertj.core.internal.TypeComparators> in (RecursiveComparisonConfiguration.java:0)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.hasComparatorForType(java.lang.Class)> calls method <org.assertj.core.internal.TypeComparators.hasComparatorForType(java.lang.Class)> in (RecursiveComparisonConfiguration.java:75)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.hasCustomComparators()> calls method <org.assertj.core.internal.TypeComparators.isEmpty()> in (RecursiveComparisonConfiguration.java:79)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.registerComparatorForType(java.util.Comparator, java.lang.Class)> calls method <org.assertj.core.internal.TypeComparators.put(java.lang.Class, java.util.Comparator)> in (RecursiveComparisonConfiguration.java:260)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonDifferenceCalculator$ComparisonState.initDualValuesToCompare(java.lang.Object, java.lang.Object, java.util.List, boolean)> calls method <org.assertj.core.internal.Objects.getFieldsNames(java.lang.Class)> in (RecursiveComparisonDifferenceCalculator.java:116)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonDifferenceCalculator.deepHashCode(java.lang.Object)> calls method <org.assertj.core.internal.Objects.getDeclaredFieldsIncludingInherited(java.lang.Class)> in (RecursiveComparisonDifferenceCalculator.java:622)
Method <org.assertj.core.api.recursive.comparison.RecursiveComparisonDifferenceCalculator.determineDifferences(java.lang.Object, java.lang.Object, java.util.List, boolean, java.util.Set, org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration)> calls method <org.assertj.core.internal.Objects.getFieldsNames(java.lang.Class)> in (RecursiveComparisonDifferenceCalculator.java:268)
3 changes: 3 additions & 0 deletions archunit_store/stored.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
#Sat Feb 01 11:13:44 CET 2020
Layered\ architecture\ consisting\ of\nlayer\ 'annotations'\ ('org.assertj.core.annotations')\nlayer\ 'api'\ ('org.assertj.core.api')\nlayer\ 'condition'\ ('org.assertj.core.condition')\nlayer\ 'configuration'\ ('org.assertj.core.configuration')\nlayer\ 'data'\ ('org.assertj.core.data')\nlayer\ 'description'\ ('org.assertj.core.description')\nlayer\ 'error'\ ('org.assertj.core.error')\nlayer\ 'extractor'\ ('org.assertj.core.extractor')\nlayer\ 'groups'\ ('org.assertj.core.groups')\nlayer\ 'internal'\ ('org.assertj.core.internal..')\nlayer\ 'matcher'\ ('org.assertj.core.matcher')\nlayer\ 'presentation'\ ('org.assertj.core.presentation')\nlayer\ 'util'\ ('org.assertj.core.util')\nwhere\ layer\ 'internal'\ may\ only\ be\ accessed\ by\ layers\ ['annotations',\ 'api',\ 'condition',\ 'configuration',\ 'data',\ 'description',\ 'error',\ 'extractor',\ 'groups',\ 'matcher',\ 'presentation']=a7253140-a775-4d8b-8f63-e57ad212fdea
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@
<version>3.1.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit5</artifactId>
<version>0.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
75 changes: 75 additions & 0 deletions src/test/java/org/assertj/core/architecture/ArchitectureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* 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
*
* http://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.
*
* Copyright 2012-2020 the original author or authors.
*/
package org.assertj.core.architecture;

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.library.Architectures.layeredArchitecture;
import static com.tngtech.archunit.library.freeze.FreezingArchRule.freeze;
import static org.assertj.core.architecture.ArchitectureTest.ROOT_PACKAGE;

@AnalyzeClasses(packages = ROOT_PACKAGE, importOptions = DoNotIncludeTests.class)
public class ArchitectureTest {
static final String ROOT_PACKAGE = "org.assertj.core.";

private static final String ANNOTATIONS_LAYER = "annotations";
private static final String API_LAYER = "api";
private static final String CONDITION_LAYER = "condition";
private static final String CONFIGURATION_LAYER = "configuration";
private static final String DATA_LAYER = "data";
private static final String DESCRIPTION_LAYER = "description";
private static final String ERROR_LAYER = "error";
private static final String EXTRACTOR_LAYER = "extractor";
private static final String GROUPS_LAYER = "groups";
private static final String INTERNAL_LAYER = "internal";
private static final String MATCHER_LAYER = "matcher";
private static final String PRESENTATION_LAYER = "presentation";
private static final String UTIL_LAYER = "util";

private static final String API_PACKAGE = ROOT_PACKAGE + API_LAYER;

//@formatter:off
@ArchTest
private static final ArchRule layerRule = freeze(layeredArchitecture()
.layer(ANNOTATIONS_LAYER).definedBy(ROOT_PACKAGE + ANNOTATIONS_LAYER)
.layer(API_LAYER).definedBy(API_PACKAGE)
.layer(CONDITION_LAYER).definedBy(ROOT_PACKAGE + CONDITION_LAYER)
.layer(CONFIGURATION_LAYER).definedBy(ROOT_PACKAGE + CONFIGURATION_LAYER)
.layer(DATA_LAYER).definedBy(ROOT_PACKAGE + DATA_LAYER)
.layer(DESCRIPTION_LAYER).definedBy(ROOT_PACKAGE + DESCRIPTION_LAYER)
.layer(ERROR_LAYER).definedBy(ROOT_PACKAGE + ERROR_LAYER)
.layer(EXTRACTOR_LAYER).definedBy(ROOT_PACKAGE + EXTRACTOR_LAYER)
.layer(GROUPS_LAYER).definedBy(ROOT_PACKAGE + GROUPS_LAYER)
.layer(INTERNAL_LAYER).definedBy(ROOT_PACKAGE + INTERNAL_LAYER + "..")
.layer(MATCHER_LAYER).definedBy(ROOT_PACKAGE + MATCHER_LAYER)
.layer(PRESENTATION_LAYER).definedBy(ROOT_PACKAGE + PRESENTATION_LAYER)
.layer(UTIL_LAYER).definedBy(ROOT_PACKAGE + UTIL_LAYER)

.whereLayer(INTERNAL_LAYER).mayOnlyBeAccessedByLayers(
ANNOTATIONS_LAYER,
API_LAYER,
CONDITION_LAYER,
CONFIGURATION_LAYER,
DATA_LAYER,
DESCRIPTION_LAYER,
ERROR_LAYER,
EXTRACTOR_LAYER,
GROUPS_LAYER,
MATCHER_LAYER,
PRESENTATION_LAYER));
// UTIL_LAYER can't access INTERNAL_LAYER
//@formatter:on
}