This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1602c2cdd88412e70396f2102e1fa8709e4669a3 Author: Andi Huber <[email protected]> AuthorDate: Mon Jul 11 10:26:35 2022 +0200 ISIS-3049: minor: rename test mixins --- .../ActionAssociateWithVm_makeFavorite.java | 2 +- .../DomainModelTest_usingGoodDomain.java | 12 ++++++------ .../domainmodel/MetaModelRegressionTest.java | 5 +++-- .../src/test/resources/metamodel.xml.zip | Bin 89738 -> 89706 bytes ...action.java => ProperMemberSupport_action1.java} | 2 +- ...on.java => ProperMemberSupport_collection1.java} | 2 +- ...erty.java => ProperMemberSupport_property1.java} | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java index b87cada793..b457b8524d 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java @@ -25,9 +25,9 @@ import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.ActionLayout; import org.apache.isis.applib.annotation.MemberSupport; -import demoapp.dom.domain.actions.Action.associateWith.child.ActionAssociateWithChildVm; import lombok.RequiredArgsConstructor; +import demoapp.dom.domain.actions.Action.associateWith.child.ActionAssociateWithChildVm; //tag::class[] @Action diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java index 3b210ba05f..6782078737 100644 --- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java +++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java @@ -180,9 +180,9 @@ class DomainModelTest_usingGoodDomain { val holderSpec = specificationLoader.specForTypeElseFail(ProperMemberSupport.class); - val mx_action = holderSpec.getActionElseFail("action"); // when @Action at type level + val mx_action = holderSpec.getActionElseFail("action1"); // when @Action at type level assertNotNull(mx_action); - assertEquals("action", mx_action.getId()); + assertEquals("action1", mx_action.getId()); assertEquals("foo", mx_action.getStaticFriendlyName().get()); assertEquals("bar", mx_action.getStaticDescription().get()); assertHasPublishedActionFacet(mx_action); @@ -191,9 +191,9 @@ class DomainModelTest_usingGoodDomain { assertNotNull(mx_action2); assertHasPublishedActionFacet(mx_action2); - val mx_property = holderSpec.getAssociationElseFail("property"); // when @Property at type level + val mx_property = holderSpec.getAssociationElseFail("property1"); // when @Property at type level assertNotNull(mx_property); - assertEquals("property", mx_property.getId()); + assertEquals("property1", mx_property.getId()); assertEquals("foo", mx_property.getStaticFriendlyName().get()); assertEquals("bar", mx_property.getStaticDescription().get()); @@ -203,9 +203,9 @@ class DomainModelTest_usingGoodDomain { assertEquals("foo", mx_property2.getStaticFriendlyName().get()); assertEquals("bar", mx_property2.getStaticDescription().get()); - val mx_collection = holderSpec.getAssociationElseFail("collection"); // when @Collection at type level + val mx_collection = holderSpec.getAssociationElseFail("collection1"); // when @Collection at type level assertNotNull(mx_collection); - assertEquals("collection", mx_collection.getId()); + assertEquals("collection1", mx_collection.getId()); assertEquals("foo", mx_collection.getStaticFriendlyName().get()); assertEquals("bar", mx_collection.getStaticDescription().get()); diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java index b4add9a7e0..2478a7b0b5 100644 --- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java +++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.java @@ -29,6 +29,7 @@ import javax.inject.Inject; import org.assertj.core.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; @@ -65,7 +66,7 @@ import lombok.val; IsisPresets.SilenceProgrammingModel }) //uncomment if intended only for manual verification. -//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true") +@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true") class MetaModelRegressionTest { @Inject MetaModelServiceMenu metaModelServiceMenu; @@ -82,7 +83,7 @@ class MetaModelRegressionTest { } //for maintenance - // createReferenceMetaModelFile(new File("d:/tmp/_scratch/metamodel.xml.zip")); + //createReferenceMetaModelFile(new File("d:/tmp/_scratch/metamodel.xml.zip")); } @Test diff --git a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip index 3bf41c1008..59b75137e3 100644 Binary files a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip and b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip differ diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java similarity index 98% rename from regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java rename to regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java index 9ca3fe1de0..49e225399a 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action1.java @@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor; @Action(executionPublishing = Publishing.ENABLED) @ActionLayout(named = "foo", describedAs = "bar") @RequiredArgsConstructor -public class ProperMemberSupport_action { +public class ProperMemberSupport_action1 { private final ProperMemberSupport holder; diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java similarity index 97% rename from regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java rename to regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java index 6f8d8531ab..083bbd3371 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection1.java @@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor; @Collection @CollectionLayout(named = "foo", describedAs = "bar") @RequiredArgsConstructor -public class ProperMemberSupport_collection { +public class ProperMemberSupport_collection1 { private final ProperMemberSupport holder; diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java similarity index 97% rename from regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java rename to regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java index e1fd49048e..0a5c315365 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property1.java @@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor; @Property @PropertyLayout(named = "foo", describedAs = "bar") @RequiredArgsConstructor -public class ProperMemberSupport_property { +public class ProperMemberSupport_property1 { private final ProperMemberSupport holder;
