You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/28 12:11:04 UTC
[isis] branch ISIS-2756 created (now 43a3d3c)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2756
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 43a3d3c ISIS-2756: converts PojoTester to use junit 5 APIs only
This branch includes the following new commits:
new 43a3d3c ISIS-2756: converts PojoTester to use junit 5 APIs only
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 01/01: ISIS-2756: converts PojoTester to use junit 5 APIs
only
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2756
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 43a3d3ca98687255b55400930de9646cf1105e7d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jun 28 13:10:43 2021 +0100
ISIS-2756: converts PojoTester to use junit 5 APIs only
---
.../testing/unittestsupport/applib/dom/pojo/PojoTester.java | 10 ++++------
.../applib/dom/pojo/PojoTester_broken_Test.java | 5 ++---
.../applib/dom/pojo/PojoTester_datatypes_applib_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_bean_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_enum_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_java_time_Test.java | 3 +--
.../applib/dom/pojo/PojoTester_datatypes_joda_Test.java | 2 +-
.../dom/pojo/PojoTester_datatypes_no_data_factory_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_primitive_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_string_Test.java | 2 +-
.../applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java | 2 +-
11 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
index 0208ba8..3cad3bd 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
@@ -42,9 +42,11 @@ import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
+import org.opentest4j.AssertionFailedError;
+
import org.apache.isis.commons.internal.collections._Lists;
-import junit.framework.AssertionFailedError;
+import lombok.val;
/**
* @since 2.0 {@index}
@@ -320,11 +322,7 @@ public final class PojoTester {
lastCause = te.getCause();
}
}
- final AssertionFailedError err = new AssertionFailedError(
- b.toString());
- if (lastCause != null) {
- err.initCause(lastCause);
- }
+ val err = new AssertionFailedError(b.toString(), lastCause);
throw err;
}
}
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
index db1071e..2459841 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
@@ -20,8 +20,7 @@ package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_broken_Test {
@@ -71,7 +70,7 @@ public class PojoTester_broken_Test {
Assertions.assertThatThrownBy(() -> {
PojoTester.create()
.exercise(customer);
- }).isInstanceOf(junit.framework.AssertionFailedError.class)
+ }).isInstanceOf(org.opentest4j.AssertionFailedError.class)
.withFailMessage(() -> "someString: null");
}
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
index 7cc1b29..26b7ada 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
@@ -26,7 +26,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.ApplibClo
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_applib_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
index 85ebb11..d95ce13 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
@@ -26,7 +26,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.ExampleBe
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_bean_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
index ad8a9d4..c1891c6 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
@@ -25,7 +25,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.ColourEnu
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_enum_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
index 1ea3f78..361b083 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
@@ -20,6 +20,7 @@ package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.JavaLocalDateHolder;
import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.JavaLocalDateTimeHolder;
@@ -28,8 +29,6 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.JavaOffse
import lombok.val;
-import junit.framework.AssertionFailedError;
-
public class PojoTester_datatypes_java_time_Test {
@Test
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
index 2a9b66d..ebd38ed 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
@@ -27,7 +27,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.JodaLocal
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_joda_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
index d568d97..7e8b237 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
@@ -25,7 +25,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.JodaLocal
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_no_data_factory_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
index bd7aba1..ba3d6e5 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
@@ -31,7 +31,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.ShortHold
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_primitive_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
index 9078031..6af3675 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
@@ -25,7 +25,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.StringHol
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_string_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
index e45991c..a26d141 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
@@ -31,7 +31,7 @@ import org.apache.isis.testing.unittestsupport.applib.dom.pojo.holders.ShortWrap
import lombok.val;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
public class PojoTester_datatypes_wrapper_Test {