You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/09/13 15:20:35 UTC
[isis] branch master updated: ISIS-3209: pom cleanups and more test fixes
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
The following commit(s) were added to refs/heads/master by this push:
new a7cb7ca201 ISIS-3209: pom cleanups and more test fixes
a7cb7ca201 is described below
commit a7cb7ca20163e524ab31a35aad1b0e3461b69177
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 13 17:20:29 2022 +0200
ISIS-3209: pom cleanups and more test fixes
---
api/applib/pom.xml | 14 -----------
.../ImposteriserTestUsingCodegenPlugin_Test.java | 3 ---
tooling/metaprog/pom.xml | 28 ++++------------------
tooling/pom.xml | 17 +++----------
viewers/wicket/graceful/pom.xml | 14 -----------
viewers/wicket/model/pom.xml | 14 -----------
.../model/models/test/EntityModel_hintsTest.java | 17 ++++---------
viewers/wicket/ui/pom.xml | 16 +------------
.../choices/ChoiceProviderForReferencesTest.java | 13 ++++++++++
9 files changed, 27 insertions(+), 109 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 84059f82d6..d1edc7c419 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -106,20 +106,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
index be3b446fe0..cb1fa4b427 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -92,8 +91,6 @@ class ImposteriserTestUsingCodegenPlugin_Test {
}
}
- //FIXME[ISIS-3207]
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
@Test
void imposteriserShouldBeUsableForMockery() {
diff --git a/tooling/metaprog/pom.xml b/tooling/metaprog/pom.xml
index a06947f63e..be638f7cee 100644
--- a/tooling/metaprog/pom.xml
+++ b/tooling/metaprog/pom.xml
@@ -61,32 +61,14 @@
<scope>test</scope>
</dependency>
- <!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- TESTING -->
+
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 8fe7592b3b..9f68c6ee18 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -298,21 +298,10 @@
<!-- TESTING -->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/viewers/wicket/graceful/pom.xml b/viewers/wicket/graceful/pom.xml
index 3bf02ef248..bcf3b25de7 100644
--- a/viewers/wicket/graceful/pom.xml
+++ b/viewers/wicket/graceful/pom.xml
@@ -74,20 +74,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index f1ca486980..2dc719cfff 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -58,20 +58,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java
index d1f200cb8b..c364b02ff3 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
package org.apache.isis.viewer.wicket.model.models.test;
-/*
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -34,16 +34,11 @@ import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import lombok.val;*/
+import lombok.val;
//FIXME[ISIS-3207] eclipse refuses to build
-class EntityModel_hintsTest {
-
-}
-/*
//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
-@Disabled
-//@ExtendWith(MockitoExtension.class)
+@ExtendWith(MockitoExtension.class)
class EntityModel_hintsTest {
@Mock MarkupContainer mockParent;
@@ -145,6 +140,4 @@ class EntityModel_hintsTest {
assertThat(target.getHint(mockComponent1, "id2-R"), is("2.R"));
}
-
}
-*/
\ No newline at end of file
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index c54ff94bc2..86884e8ba8 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -348,20 +348,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -373,7 +359,7 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-jodatime-integration</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
index 44cddab08f..ada9ff051e 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
@@ -59,6 +59,19 @@ class ChoiceProviderForReferencesTest extends ChoiceProviderTestAbstract {
}
//FIXME[ISIS-3207]
+ /*
+ * java.lang.IllegalAccessException:
+ * class org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacetForViewModelInterface
+ * (in module org.apache.isis.core.metamodel)
+ * cannot access
+ * class org.apache.isis.viewer.wicket.ui.test.components.widgets.choices.ChoiceProviderForReferencesTest$Customer
+ * (in module org.apache.isis.viewer.wicket.ui)
+ * because module
+ * org.apache.isis.viewer.wicket.ui
+ * does not export
+ * org.apache.isis.viewer.wicket.ui.test.components.widgets.choices
+ * to module org.apache.isis.core.metamodel
+ */
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
@Test
void roundtrip() {