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 2020/01/10 12:56:47 UTC

[isis] 01/22: ISIS-2259: removes some deprecated classes from base subdomain module's tests.

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 86f80a716009f573b630baeab002aab58b05122e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:19:22 2020 +0000

    ISIS-2259: removes some deprecated classes from base subdomain module's tests.
---
 ...arableByCodeContractTestAbstract_compareTo.java | 26 ----------------------
 .../dom/with/ComparableByCodeContractTester.java   | 16 -------------
 ...yDescriptionContractTestAbstract_compareTo.java | 26 ----------------------
 .../ComparableByDescriptionContractTester.java     | 17 --------------
 ...arableByNameContractTestAbstract_compareTo.java | 26 ----------------------
 .../dom/with/ComparableByNameContractTester.java   | 17 --------------
 ...eByReferenceContractTestAbstract_compareTo.java | 26 ----------------------
 .../with/ComparableByReferenceContractTester.java  | 17 --------------
 ...rableByTitleContractTestAbstract_compareTo.java | 26 ----------------------
 .../dom/with/ComparableByTitleContractTester.java  | 17 --------------
 .../dom/with/InstantiatorForComparableByCode.java  | 16 -------------
 .../InstantiatorForComparableByDescription.java    | 17 --------------
 .../dom/with/InstantiatorForComparableByName.java  | 16 -------------
 .../with/InstantiatorForComparableByReference.java | 17 --------------
 .../dom/with/InstantiatorForWithStartDate.java     | 16 -------------
 .../WithFieldUniqueContractTestAllAbstract.java    | 18 ---------------
 ...valMutableContractTestAbstract_changeDates.java | 13 -----------
 17 files changed, 327 deletions(-)

diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
deleted file mode 100644
index 73b947f..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithCodeComparable}.
- * 
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByCodeContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByCodeContractTestAbstract_compareTo extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTestAbstract_compareTo {
-
-    protected ComparableByCodeContractTestAbstract_compareTo(
-            final String packagePrefix,
-            final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
-        super(packagePrefix, noninstantiableSubstitutes);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
deleted file mode 100644
index f237abb..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTester<T> {
-
-    public ComparableByCodeContractTester(Class<T> cls) {
-        super(cls);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
deleted file mode 100644
index c51dd83..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithDescriptionComparable}.
- * 
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByDescriptionContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByDescriptionContractTestAbstract_compareTo extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTestAbstract_compareTo {
-
-    protected ComparableByDescriptionContractTestAbstract_compareTo(
-            final String packagePrefix,
-            final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
-        super(packagePrefix, noninstantiableSubstitutes);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
deleted file mode 100644
index 52a3ab2..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTester<T> {
-
-    public ComparableByDescriptionContractTester(Class<T> cls) {
-        super(cls);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
deleted file mode 100644
index e7f86d5..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithNameComparable}.
- * 
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByNameContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByNameContractTestAbstract_compareTo extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTestAbstract_compareTo {
-
-    protected ComparableByNameContractTestAbstract_compareTo(
-            final String packagePrefix,
-            final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
-        super(packagePrefix, noninstantiableSubstitutes);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
deleted file mode 100644
index 00a586f..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByNameContractTester<T extends WithNameComparable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTester<T> {
-
-    public ComparableByNameContractTester(Class<T> cls) {
-        super(cls);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
deleted file mode 100644
index b466b30..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithReferenceComparable}.
- * 
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByReferenceContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByReferenceContractTestAbstract_compareTo extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTestAbstract_compareTo {
-
-    protected ComparableByReferenceContractTestAbstract_compareTo(
-            final String packagePrefix,
-            final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
-        super(packagePrefix, noninstantiableSubstitutes);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
deleted file mode 100644
index 20beecd..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTester<T> {
-
-    public ComparableByReferenceContractTester(Class<T> cls) {
-        super(cls);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
deleted file mode 100644
index b5a47cb..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithTitleComparable}.
- * 
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByTitleContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByTitleContractTestAbstract_compareTo extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTestAbstract_compareTo {
-
-    protected ComparableByTitleContractTestAbstract_compareTo(
-            final String packagePrefix,
-            final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
-        super(packagePrefix, noninstantiableSubstitutes);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
deleted file mode 100644
index 935c777..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTester<T> {
-
-    public ComparableByTitleContractTester(Class<T> cls) {
-        super(cls);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
deleted file mode 100644
index 7ec2559..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByCode extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByCode {
-
-    public InstantiatorForComparableByCode(Class<? extends WithCodeComparable<?>> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
deleted file mode 100644
index e10baff..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByDescription extends
-        org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByDescription {
-
-    public InstantiatorForComparableByDescription(Class<? extends WithDescriptionComparable<?>> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
deleted file mode 100644
index 0d0818a..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByName extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByName {
-
-    public InstantiatorForComparableByName(Class<? extends WithNameComparable<?>> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
deleted file mode 100644
index 37cfc18..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByReference extends
-        org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByReference {
-
-    public InstantiatorForComparableByReference(Class<? extends WithReferenceComparable<?>> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
deleted file mode 100644
index e33c04b..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithStartDate;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForWithStartDate extends org.apache.isis.subdomains.base.applib.with.InstantiatorForWithStartDate {
-
-    public InstantiatorForWithStartDate(Class<? extends WithStartDate> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
deleted file mode 100644
index ed84d72..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class WithFieldUniqueContractTestAllAbstract<T> extends
-        org.apache.isis.subdomains.base.applib.with.WithFieldUniqueContractTestAllAbstract<T> {
-
-    public WithFieldUniqueContractTestAllAbstract(
-            final String prefix,
-            final String fieldName,
-            final Class<T> interfaceType) {
-        super(prefix, fieldName, interfaceType);
-    }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
deleted file mode 100644
index a2d2533..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithIntervalMutable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> extends
-        org.apache.isis.subdomains.base.applib.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
-
-}