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 2018/05/19 09:37:34 UTC
[isis] 13/13: ISIS-1949: Move tests that depend on codegen plugins
to plugins
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 7243551954e919f681fee530ac59e658a9e6ab71
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 19 11:31:08 2018 +0200
ISIS-1949: Move tests that depend on codegen plugins to plugins
Task-Url: https://issues.apache.org/jira/browse/ISIS-1949
---
core/plugins/codegen-javassist/pom.xml | 6 ++++++
.../runtime/services/ServiceInstantiatorTestUsingJavassist.java} | 5 +++--
.../isis/core/runtime/services/ServiceInstantiatorTest.java | 9 +++++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/core/plugins/codegen-javassist/pom.xml b/core/plugins/codegen-javassist/pom.xml
index 69a5977..190059b 100644
--- a/core/plugins/codegen-javassist/pom.xml
+++ b/core/plugins/codegen-javassist/pom.xml
@@ -74,6 +74,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java b/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java
similarity index 99%
copy from core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
copy to core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java
index 7dcb1b5..0b6a6f3 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++ b/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java
@@ -1,3 +1,4 @@
+package org.apache.isis.core.runtime.services;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.runtime.services;
+
import java.util.Collections;
import java.util.List;
@@ -43,7 +44,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-public class ServiceInstantiatorTest {
+public class ServiceInstantiatorTestUsingJavassist {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index 7dcb1b5..791a3f4 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -32,6 +32,7 @@ import com.google.common.collect.Lists;
import org.jmock.auto.Mock;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -67,13 +68,13 @@ public class ServiceInstantiatorTest {
assertThat(calculator.add(3,4), is(7));
}
- @Test
+ @Test @Ignore("test is in core plugins codegen-*")
public void requestScoped_instantiate() {
AccumulatingCalculator calculator = serviceInstantiator.createInstance(AccumulatingCalculator.class);
assertThat(calculator instanceof RequestScopedService, is(true));
}
- @Test
+ @Test @Ignore("test is in core plugins codegen-*")
public void requestScoped_justOneThread() {
AccumulatingCalculator calculator = serviceInstantiator.createInstance(AccumulatingCalculator.class);
try {
@@ -86,7 +87,7 @@ public class ServiceInstantiatorTest {
}
}
- @Test
+ @Test @Ignore("test is in core plugins codegen-*")
public void requestScoped_multipleThreads() throws InterruptedException, BrokenBarrierException {
final AccumulatingCalculator calculator = serviceInstantiator.createInstance(AccumulatingCalculator.class);
@@ -140,7 +141,7 @@ public class ServiceInstantiatorTest {
assertThat(totals[2], is(30));
}
- @Test
+ @Test @Ignore("test is in core plugins codegen-*")
public void requestScoped_childThreads() throws InterruptedException {
final Consumer consumer = serviceInstantiator.createInstance(Consumer.class);
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.