Merge pull request #128 from olibye/master

Fix Synchroniser issue #121 and ByteBudderImposteriser ClassLoader issue #127
jmock-developers · May 18, 2019 · 29efca3 · 29efca3
2 parents a6a9d32 + 706db90
commit 29efca3
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 55 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,17 @@
 language: java
 
 jdk:
-#  - openjdk-ea
+  - openjdk-ea
   - openjdk11
-#  - oraclejdk11
+  - oraclejdk11
   - openjdk10
 #  - oraclejdk10
   - openjdk9
-  - oraclejdk8
-#  - openjdk7 #oracle not supported anymore 
-#  - openjdk6 not supported any more
+  - oraclejdk8 #not supported
+
+matrix:
+  allow_failures:
+    - jdk: openjdk-ea
 
 env:
 # Travis has slow VMs?

diff --git a/jmock-example/pom.xml b/jmock-example/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -47,12 +47,12 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit3</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/jmock-imposters-tests/pom.xml b/jmock-imposters-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>jmock-imposters-tests</artifactId>
 
@@ -15,23 +15,23 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit5</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-testjar</artifactId>
-            <version>2.11.0</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/...unit/lib/legacy/Java8Issue79UnitTest.java → ...nit/lib/legacy/Issue79And127UnitTest.java b/...unit/lib/legacy/Java8Issue79UnitTest.java → ...nit/lib/legacy/Issue79And127UnitTest.java
@@ -2,13 +2,16 @@
 
 import java.io.File;
 
+import javax.sql.DataSource;
+
 import org.jmock.api.Imposteriser;
 import org.jmock.imposters.ByteBuddyClassImposteriser;
-import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.junit5.JUnit5Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.jmock.test.acceptance.AbstractImposteriserParameterResolver;
 import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
@@ -20,8 +23,10 @@
  * @see https://github.com/cglib/cglib/issues/20
  * 
  */
-public class Java8Issue79UnitTest {
-    public final JUnit4Mockery context = new JUnit4Mockery();
+public class Issue79And127UnitTest {
+
+    @RegisterExtension
+    public final JUnit5Mockery context = new JUnit5Mockery();
 
     /**
      * However it fails in java 11 as asm and cglib do not appear to support java
@@ -45,6 +50,7 @@ public void testMock(Imposteriser imposteriserImpl) {
     public void testByteBuddyImposteriser(Imposteriser imposteriserImpl) {
         context.setImposteriser(imposteriserImpl);
         context.mock(File.class);
+        context.mock(DataSource.class);
     }
 
     public static class ByteBuddyImposteriserParameterResolver extends AbstractImposteriserParameterResolver {

diff --git a/jmock-imposters/pom.xml b/jmock-imposters/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>jmock-imposters</artifactId>
     <description>Class mocks are more numerous than interface mocks, so drop the legacy name</description>

diff --git a/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java b/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java
@@ -152,7 +152,8 @@ public Object invoke(Object receiver, Method method, Object[] args) throws Throw
         // https://mydailyjava.blogspot.com/2018/04/jdk-11-and-proxies-in-world-past.html
         ClassLoadingStrategy<ClassLoader> strategy;
         if (ClassInjector.UsingLookup.isAvailable() && !protectedPackageNameSpaces(mockedType)
-                && !defaultPackage(mockedType)) {
+                && !defaultPackage(mockedType)
+                && mockedType.getClassLoader() == this.getClass().getClassLoader()) {
             Class<?> methodHandles = Class.forName("java.lang.invoke.MethodHandles");
             Object lookup = methodHandles.getMethod("lookup").invoke(null);
             Method privateLookupIn = methodHandles.getMethod("privateLookupIn",

diff --git a/jmock-junit3/pom.xml b/jmock-junit3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jmock-junit3</artifactId>

diff --git a/jmock-junit4/pom.xml b/jmock-junit4/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/...k-junit4/src/test/java/org/jmock/test/unit/lib/concurrent/internal/SynchroniserTests.java b/...k-junit4/src/test/java/org/jmock/test/unit/lib/concurrent/internal/SynchroniserTests.java
@@ -22,7 +22,8 @@ public interface Events {
     }
 
     Synchroniser synchroniser = new Synchroniser();
-
+
+    // Not a rule, to allow checking the mockery is *not* satisfied
     Mockery mockery = new JUnit4Mockery() {{
         setThreadingPolicy(synchroniser);
     }};
@@ -42,7 +43,7 @@ public void run() {
                 mockObject.action();
             }
         });
-        
+
         mockery.assertIsSatisfied();
     }
 
@@ -70,6 +71,7 @@ public void run() {
         });
 
         synchroniser.waitUntil(threads.is("finished"));
+        mockery.assertIsSatisfied();
     }
 
     @Test(timeout=250)
@@ -96,6 +98,7 @@ public void run() {
         });
 
         synchroniser.waitUntil(threads.is("finished"), 100);
+        mockery.assertIsSatisfied();
     }
 
     @Test(timeout=250)

diff --git a/jmock-junit5/pom.xml b/jmock-junit5/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/jmock-junit5/src/test/java/org/jmock/junit5/acceptance/JUnit5TestRunnerTests.java b/jmock-junit5/src/test/java/org/jmock/junit5/acceptance/JUnit5TestRunnerTests.java
@@ -1,15 +1,20 @@
 package org.jmock.junit5.acceptance;
 
-import org.jmock.junit5.testdata.DerivedJUnit5TestThatDoesNotSatisfyExpectations;
-import org.jmock.junit5.testdata.JUnit5TestThatAutoInstantiatesMocks;
-import org.jmock.junit5.testdata.JUnit5TestThatCreatesNoMockery;
-import org.jmock.junit5.testdata.JUnit5TestThatCreatesTwoMockeries;
-import org.jmock.junit5.testdata.JUnit5TestThatDoesNotCreateAMockery;
-import org.jmock.junit5.testdata.JUnit5TestThatDoesNotSatisfyExpectations;
-import org.jmock.junit5.testdata.JUnit5TestThatDoesSatisfyExpectations;
-import org.jmock.junit5.testdata.JUnit5TestThatThrowsExpectedException;
+import org.jmock.junit5.testdata.jmock.acceptance.DerivedJUnit5TestThatDoesNotSatisfyExpectations;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatAutoInstantiatesMocks;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatCreatesNoMockery;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatCreatesTwoMockeries;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatDoesNotCreateAMockery;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatDoesNotSatisfyExpectations;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatDoesSatisfyExpectations;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5TestThatThrowsExpectedException;
 import org.junit.jupiter.api.Test;
 
+/**
+ * Wrap, running "testdata" testcases. Some of which are supposed to fail
+ * @author oliverbye
+ *
+ */
 public class JUnit5TestRunnerTests {
 
     FailureRecordingTestExecutionListener listener = new FailureRecordingTestExecutionListener();

diff --git a/jmock-junit5/src/test/java/org/jmock/junit5/acceptance/JUnit5WithRulesTestRunnerTests.java b/jmock-junit5/src/test/java/org/jmock/junit5/acceptance/JUnit5WithRulesTestRunnerTests.java
@@ -1,6 +1,6 @@
 package org.jmock.junit5.acceptance;
 
-import org.jmock.junit5.testdata.JUnit5WithRulesExamples;
+import org.jmock.junit5.testdata.jmock.acceptance.JUnit5WithRulesExamples;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 

diff --git a/...junit5/testdata/BaseClassWithMockery.java → ...mock/acceptance/BaseClassWithMockery.java b/...junit5/testdata/BaseClassWithMockery.java → ...mock/acceptance/BaseClassWithMockery.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.junit5.JUnit5Mockery;
 import org.junit.jupiter.api.extension.RegisterExtension;

diff --git a/...t5TestThatDoesNotSatisfyExpectations.java → ...t5TestThatDoesNotSatisfyExpectations.java b/...t5TestThatDoesNotSatisfyExpectations.java → ...t5TestThatDoesNotSatisfyExpectations.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;

diff --git a/.../JUnit5TestThatAutoInstantiatesMocks.java → .../JUnit5TestThatAutoInstantiatesMocks.java b/.../JUnit5TestThatAutoInstantiatesMocks.java → .../JUnit5TestThatAutoInstantiatesMocks.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;

diff --git a/...tdata/JUnit5TestThatCreatesNoMockery.java → ...tance/JUnit5TestThatCreatesNoMockery.java b/...tdata/JUnit5TestThatCreatesNoMockery.java → ...tance/JUnit5TestThatCreatesNoMockery.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.junit5.JUnit5Mockery;
 import org.junit.jupiter.api.Test;

diff --git a/...ta/JUnit5TestThatCreatesTwoMockeries.java → ...ce/JUnit5TestThatCreatesTwoMockeries.java b/...ta/JUnit5TestThatCreatesTwoMockeries.java → ...ce/JUnit5TestThatCreatesTwoMockeries.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.junit5.JUnit5Mockery;
 import org.junit.jupiter.api.Test;

diff --git a/.../JUnit5TestThatDoesNotCreateAMockery.java → .../JUnit5TestThatDoesNotCreateAMockery.java b/.../JUnit5TestThatDoesNotCreateAMockery.java → .../JUnit5TestThatDoesNotCreateAMockery.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.junit5.JUnit5Mockery;
 import org.junit.jupiter.api.Test;

diff --git a/...t5TestThatDoesNotSatisfyExpectations.java → ...t5TestThatDoesNotSatisfyExpectations.java b/...t5TestThatDoesNotSatisfyExpectations.java → ...t5TestThatDoesNotSatisfyExpectations.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;

diff --git a/...Unit5TestThatDoesSatisfyExpectations.java → ...Unit5TestThatDoesSatisfyExpectations.java b/...Unit5TestThatDoesSatisfyExpectations.java → ...Unit5TestThatDoesSatisfyExpectations.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;

diff --git a/...Unit5TestThatThrowsExpectedException.java → ...Unit5TestThatThrowsExpectedException.java b/...Unit5TestThatThrowsExpectedException.java → ...Unit5TestThatThrowsExpectedException.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import org.jmock.Expectations;
 import org.jmock.junit5.JUnit5Mockery;

diff --git a/...it5/testdata/JUnit5WithRulesExamples.java → ...k/acceptance/JUnit5WithRulesExamples.java b/...it5/testdata/JUnit5WithRulesExamples.java → ...k/acceptance/JUnit5WithRulesExamples.java
@@ -1,4 +1,4 @@
-package org.jmock.junit5.testdata;
+package org.jmock.junit5.testdata.jmock.acceptance;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;

diff --git a/...junit5/src/test/java/org/jmock/junit5/unit/lib/concurrent/internal/SynchroniserTests.java b/...junit5/src/test/java/org/jmock/junit5/unit/lib/concurrent/internal/SynchroniserTests.java
@@ -14,7 +14,6 @@
 import org.jmock.lib.concurrent.Synchroniser;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class SynchroniserTests {
     public interface Events {
@@ -23,7 +22,8 @@ public interface Events {
     }
 
     Synchroniser synchroniser = new Synchroniser();
-    @RegisterExtension
+
+    // Not an extension, to allow checking the mockery is *not* satisfied
     JUnit5Mockery mockery = new JUnit5Mockery() {{
         setThreadingPolicy(synchroniser);
     }};
@@ -73,6 +73,7 @@ public void run() {
         });
 
         synchroniser.waitUntil(threads.is("finished"));
+        mockery.assertIsSatisfied();
     }
 
     @Test

diff --git a/jmock-legacy/pom.xml b/jmock-legacy/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/jmock/pom.xml b/jmock/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.11.0</version>
+        <version>2.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.4.0</version>
+                <version>1.6.0</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>

diff --git a/jmock/src/main/java/org/jmock/Mockery.java b/jmock/src/main/java/org/jmock/Mockery.java
@@ -53,7 +53,7 @@ public class Mockery implements SelfDescribing {
     private final Set<String> mockNames = new HashSet<String>();
     private final ReturnDefaultValueAction defaultAction = new ReturnDefaultValueAction(imposteriser);
     private final List<Invocation> actualInvocations = new ArrayList<Invocation>();
-    private final InvocationDispatcher dispatcher = threadingPolicy.dispatcher();
+    private InvocationDispatcher dispatcher = threadingPolicy.dispatcher();
 
     private Error firstError = null;
 
@@ -126,6 +126,7 @@ public void setExpectationErrorTranslator(ExpectationErrorTranslator expectation
      */
     public void setThreadingPolicy(ThreadingPolicy threadingPolicy) {
         this.threadingPolicy = threadingPolicy;
+        this.dispatcher = threadingPolicy.dispatcher();
     }
 
     /*