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:26 UTC
[isis] 01/03: ISIS-2033: cleanup 'runtime' tests
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 6cfeddbbe2c63540794db88f5e7849489d794879
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 14:24:16 2020 +0100
ISIS-2033: cleanup 'runtime' tests
---
.../interaction}/InteractionDefaultTest_next.java | 2 +-
.../adapterfactory/pojo/RuntimeTestPojo.java | 51 ----------------------
.../fixture/budget/SomeServiceToInclude.java | 22 ----------
.../budgetassignment/SomeServiceNotToInclude.java | 22 ----------
.../ObjectActionLayoutXmlDefaultTest.java | 3 +-
.../OneToManyAssociationDefaultTest.java | 2 +-
.../TypeExtractorMethodReturnTest.java | 2 +-
.../TypeExtractorMethodsParametersTest.java | 2 +-
.../runtime/{system => test/dom}/Interface1.java | 2 +-
.../{system => test/dom}/JavaActionTestObject.java | 2 +-
.../JavaObjectWithBasicProgramConventions.java | 2 +-
.../dom}/JavaObjectWithOneToOneAssociations.java | 2 +-
.../{system => test/dom}/JavaReferencedObject.java | 2 +-
.../{system => test/dom}/RuntimeTestPojo.java | 2 +-
.../{system => test/dom}/TestDomainObject.java | 2 +-
.../runtime/{system => test/dom}/TestObject.java | 2 +-
.../dom}/TestObjectAsAggregated.java | 2 +-
.../{system => test/dom}/TestObjectAsService.java | 2 +-
.../dom}/TestObjectWithCollection.java | 2 +-
19 files changed, 16 insertions(+), 112 deletions(-)
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/iactn/InteractionDefaultTest_next.java b/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/iactn/InteractionDefaultTest_next.java
rename to core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
index b50180a..cb31c8f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/iactn/InteractionDefaultTest_next.java
+++ b/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.iactn;
+package org.apache.isis.core.interaction;
import java.util.UUID;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
deleted file mode 100644
index 00e2ca3..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
-
-public class RuntimeTestPojo {
- private static int nextId;
- private final int id = nextId++;
- private final String state = "pojo" + id;
-
- @Override
- public String toString() {
- return "Pojo#" + id;
- }
-
- @Override
- public boolean equals(final Object other) {
- if (other == null) {
- return false;
- }
- if (other == this) {
- return true;
- }
- if (other.getClass() == getClass()) {
- final RuntimeTestPojo otherTestPojo = (RuntimeTestPojo) other;
- return otherTestPojo.state.equals(state);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return state.hashCode();
- }
-
-}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
deleted file mode 100644
index 34e14d8..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.runtime.systemusinginstallers.fixture.budget;
-
-public class SomeServiceToInclude {
-}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
deleted file mode 100644
index c17e740..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.runtime.systemusinginstallers.fixture.budgetassignment;
-
-public class SomeServiceNotToInclude {
-}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java
index fc6cd56..ae39e70 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/ObjectActionLayoutXmlDefaultTest.java
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java
index 847e266..7f76ddc 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/OneToManyAssociationDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java
index c32fd9d..7b444e7 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodReturnTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java
index f230121..7f0c721 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/TypeExtractorMethodsParametersTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java
index 4b31145..50d5664 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/Interface1.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public interface Interface1 {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java
index 7080ee8..3b3b2d0 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaActionTestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class JavaActionTestObject {
private boolean actionCalled = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java
index 0875758..52b3926 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithBasicProgramConventions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java
index c47e15d..a905057 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaObjectWithOneToOneAssociations.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class JavaObjectWithOneToOneAssociations {
boolean available = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java
index 696458f..0936eaf 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/JavaReferencedObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class JavaReferencedObject {
private static int next;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java
index e542b1d..427093d 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java
index 6ac2004..b0ad5a8 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestDomainObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class TestDomainObject {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java
index 9d20f20..ac4057c 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class TestObject {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java
index 05896f7..5987c73 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsAggregated.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
// import org.apache.isis.applib.Aggregated;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java
index 05d0667..e378e52 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectAsService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
public class TestObjectAsService {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java
index 28bbbc0..8ccd595 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/test/dom/TestObjectWithCollection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.core.runtime.test.dom;
import java.util.Vector;