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 2020/12/22 13:31:28 UTC
[isis] 03/03: ISIS-2033: move remaining 'runtime' tests to
'metamodel'
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 cd1269036e954f2f404761bff34fec05db6b88f6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 14:31:08 2020 +0100
ISIS-2033: move remaining 'runtime' tests to 'metamodel'
where they more closely belong
---
.../isis/core/metamodel/objects}/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../isis/core/metamodel/objects}/OneToManyAssociationDefaultTest.java | 2 +-
.../isis/core/metamodel/objects}/TypeExtractorMethodReturnTest.java | 2 +-
.../core/metamodel/objects}/TypeExtractorMethodsParametersTest.java | 2 +-
.../java/org/apache/isis/core/metamodel/objects}/dom/Interface1.java | 2 +-
.../apache/isis/core/metamodel/objects}/dom/JavaActionTestObject.java | 2 +-
.../metamodel/objects}/dom/JavaObjectWithBasicProgramConventions.java | 2 +-
.../core/metamodel/objects}/dom/JavaObjectWithOneToOneAssociations.java | 2 +-
.../apache/isis/core/metamodel/objects}/dom/JavaReferencedObject.java | 2 +-
.../org/apache/isis/core/metamodel/objects}/dom/RuntimeTestPojo.java | 2 +-
.../org/apache/isis/core/metamodel/objects}/dom/TestDomainObject.java | 2 +-
.../java/org/apache/isis/core/metamodel/objects}/dom/TestObject.java | 2 +-
.../apache/isis/core/metamodel/objects}/dom/TestObjectAsAggregated.java | 2 +-
.../apache/isis/core/metamodel/objects}/dom/TestObjectAsService.java | 2 +-
.../isis/core/metamodel/objects}/dom/TestObjectWithCollection.java | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
index ae39e70..47b8f0b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.test;
+package org.apache.isis.core.metamodel.objects;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
index 7f76ddc..bf0b088 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test;
+package org.apache.isis.core.metamodel.objects;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
index 7b444e7..4d507f8 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test;
+package org.apache.isis.core.metamodel.objects;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
index 7f0c721..d10b94d 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test;
+package org.apache.isis.core.metamodel.objects;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/Interface1.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/Interface1.java
index 50d5664..fe2131f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/Interface1.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public interface Interface1 {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaActionTestObject.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaActionTestObject.java
index 3b3b2d0..114f3d2 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaActionTestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class JavaActionTestObject {
private boolean actionCalled = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
index 52b3926..674b034 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithOneToOneAssociations.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithOneToOneAssociations.java
index a905057..4f6487d 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaObjectWithOneToOneAssociations.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class JavaObjectWithOneToOneAssociations {
boolean available = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaReferencedObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaReferencedObject.java
index 0936eaf..a241f7a 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/JavaReferencedObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class JavaReferencedObject {
private static int next;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/RuntimeTestPojo.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/RuntimeTestPojo.java
index 427093d..fd732e7 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestDomainObject.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestDomainObject.java
index b0ad5a8..3a29057 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestDomainObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class TestDomainObject {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObject.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObject.java
index ac4057c..30a0453 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class TestObject {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsAggregated.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsAggregated.java
index 5987c73..64c176b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsAggregated.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
// import org.apache.isis.applib.Aggregated;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsService.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsService.java
index e378e52..1101f9b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectAsService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
public class TestObjectAsService {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectWithCollection.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectWithCollection.java
index 8ccd595..862ddbf 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/dom/TestObjectWithCollection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.test.dom;
+package org.apache.isis.core.metamodel.objects.dom;
import java.util.Vector;