diff -Nru easymock-3.5.1+ds/bench/pom.xml easymock-3.6/bench/pom.xml
--- easymock-3.5.1+ds/bench/pom.xml 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/bench/pom.xml 2018-04-09 03:26:33.000000000 +0000
@@ -6,7 +6,7 @@
org.easymockeasymock-parent
- 3.5.1
+ 3.6easymock-bench
@@ -61,6 +61,12 @@
false
+
+ maven-deploy-plugin
+
+ true
+
+ org.apache.maven.plugins
diff -Nru easymock-3.5.1+ds/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java easymock-3.6/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java
--- easymock-3.5.1+ds/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/findbugs-exclude.xml easymock-3.6/core/findbugs-exclude.xml
--- easymock-3.5.1+ds/core/findbugs-exclude.xml 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/findbugs-exclude.xml 2018-04-09 03:26:33.000000000 +0000
@@ -8,7 +8,7 @@
-
+
@@ -18,5 +18,10 @@
-
+
+
+
+
+
+
diff -Nru easymock-3.5.1+ds/core/pom.xml easymock-3.6/core/pom.xml
--- easymock-3.5.1+ds/core/pom.xml 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/pom.xml 2018-04-09 03:26:33.000000000 +0000
@@ -7,7 +7,7 @@
org.easymockeasymock-parent
- 3.5.1
+ 3.6easymock
@@ -35,7 +35,7 @@
cglibcglib
- 3.2.5
+ 3.2.6org.apache.ant
@@ -43,11 +43,11 @@
-
+
org.ow2.asmasm
- 6.0
+ 6.1.1runtime
@@ -80,6 +80,9 @@
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+ org.easymock
+
@@ -154,6 +157,26 @@
+
+ org.codehaus.mojo
+ animal-sniffer-maven-plugin
+
+
+ org.codehaus.mojo.signature
+ java16
+ 1.1
+
+
+
+
+ source-java6-check
+ compile
+
+ check
+
+
+
+
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/Capture.java easymock-3.6/core/src/main/java/org/easymock/Capture.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/Capture.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/Capture.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/CaptureType.java easymock-3.6/core/src/main/java/org/easymock/CaptureType.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/CaptureType.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/CaptureType.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/ConstructorArgs.java easymock-3.6/core/src/main/java/org/easymock/ConstructorArgs.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/ConstructorArgs.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/ConstructorArgs.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMock.java easymock-3.6/core/src/main/java/org/easymock/EasyMock.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMock.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/EasyMock.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockListener.java easymock-3.6/core/src/main/java/org/easymock/EasyMockListener.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockListener.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/EasyMockListener.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockRule.java easymock-3.6/core/src/main/java/org/easymock/EasyMockRule.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockRule.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/EasyMockRule.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockRunner.java easymock-3.6/core/src/main/java/org/easymock/EasyMockRunner.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockRunner.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/EasyMockRunner.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockSupport.java easymock-3.6/core/src/main/java/org/easymock/EasyMockSupport.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/EasyMockSupport.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/EasyMockSupport.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/IAnswer.java easymock-3.6/core/src/main/java/org/easymock/IAnswer.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/IAnswer.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/IAnswer.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/IArgumentMatcher.java easymock-3.6/core/src/main/java/org/easymock/IArgumentMatcher.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/IArgumentMatcher.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/IArgumentMatcher.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/IExpectationSetters.java easymock-3.6/core/src/main/java/org/easymock/IExpectationSetters.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/IExpectationSetters.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/IExpectationSetters.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/IMockBuilder.java easymock-3.6/core/src/main/java/org/easymock/IMockBuilder.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/IMockBuilder.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/IMockBuilder.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/IMocksControl.java easymock-3.6/core/src/main/java/org/easymock/IMocksControl.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/IMocksControl.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/IMocksControl.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java easymock-3.6/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AndroidSupport.java easymock-3.6/core/src/main/java/org/easymock/internal/AndroidSupport.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AndroidSupport.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/AndroidSupport.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ArgumentToString.java easymock-3.6/core/src/main/java/org/easymock/internal/ArgumentToString.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ArgumentToString.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ArgumentToString.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java easymock-3.6/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java easymock-3.6/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java easymock-3.6/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ClassProxyFactory.java easymock-3.6/core/src/main/java/org/easymock/internal/ClassProxyFactory.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ClassProxyFactory.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ClassProxyFactory.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,6 +34,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -158,7 +160,7 @@
}
@SuppressWarnings("unchecked")
- public T createProxy(Class toMock, InvocationHandler handler,
+ public T createProxy(final Class toMock, InvocationHandler handler,
Method[] mockedMethods, ConstructorArgs args) {
Enhancer enhancer = createEnhancer(toMock);
@@ -177,7 +179,11 @@
// instead of the default one (which is the class to mock one)
// This is required by Eclipse Plug-ins, the mock class loader doesn't see
// cglib most of the time. Using EasyMock and the mock class loader at the same time solves this
- LinkedClassLoader linkedClassLoader = new LinkedClassLoader(toMock.getClassLoader(), ClassProxyFactory.class.getClassLoader());
+ LinkedClassLoader linkedClassLoader = AccessController.doPrivileged(new PrivilegedAction() {
+ public LinkedClassLoader run() {
+ return new LinkedClassLoader(toMock.getClassLoader(), ClassProxyFactory.class.getClassLoader());
+ }
+ });
enhancer.setClassLoader(linkedClassLoader);
mockClass = enhancer.createClass();
// ///CLOVER:ON
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java easymock-3.6/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/EasyMockProperties.java easymock-3.6/core/src/main/java/org/easymock/internal/EasyMockProperties.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/EasyMockProperties.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/EasyMockProperties.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/EasyMockStatement.java easymock-3.6/core/src/main/java/org/easymock/internal/EasyMockStatement.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/EasyMockStatement.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/EasyMockStatement.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ErrorMessage.java easymock-3.6/core/src/main/java/org/easymock/internal/ErrorMessage.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ErrorMessage.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ErrorMessage.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocation.java easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocation.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ExpectedInvocation.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ExpectedInvocation.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IClassInstantiator.java easymock-3.6/core/src/main/java/org/easymock/internal/IClassInstantiator.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IClassInstantiator.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/IClassInstantiator.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IMocksBehavior.java easymock-3.6/core/src/main/java/org/easymock/internal/IMocksBehavior.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IMocksBehavior.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/IMocksBehavior.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IMocksControlState.java easymock-3.6/core/src/main/java/org/easymock/internal/IMocksControlState.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IMocksControlState.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/IMocksControlState.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Injection.java easymock-3.6/core/src/main/java/org/easymock/internal/Injection.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Injection.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Injection.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/InjectionPlan.java easymock-3.6/core/src/main/java/org/easymock/internal/InjectionPlan.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/InjectionPlan.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/InjectionPlan.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/InjectionTarget.java easymock-3.6/core/src/main/java/org/easymock/internal/InjectionTarget.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/InjectionTarget.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/InjectionTarget.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Injector.java easymock-3.6/core/src/main/java/org/easymock/internal/Injector.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Injector.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Injector.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Invocation.java easymock-3.6/core/src/main/java/org/easymock/internal/Invocation.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Invocation.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Invocation.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IProxyFactory.java easymock-3.6/core/src/main/java/org/easymock/internal/IProxyFactory.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/IProxyFactory.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/IProxyFactory.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/JavaProxyFactory.java easymock-3.6/core/src/main/java/org/easymock/internal/JavaProxyFactory.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/JavaProxyFactory.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/JavaProxyFactory.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/LastControl.java easymock-3.6/core/src/main/java/org/easymock/internal/LastControl.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/LastControl.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/LastControl.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/LinkedClassLoader.java easymock-3.6/core/src/main/java/org/easymock/internal/LinkedClassLoader.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/LinkedClassLoader.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/LinkedClassLoader.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/And.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/And.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/And.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/And.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Any.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Any.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Any.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Any.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Captures.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Captures.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Captures.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Captures.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Compare.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Compare.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Compare.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Compare.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/CompareTo.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/CompareTo.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/CompareTo.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/CompareTo.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Contains.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Contains.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Contains.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Contains.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/EndsWith.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/EndsWith.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/EndsWith.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/EndsWith.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Equals.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Equals.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Equals.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Equals.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Find.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Find.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Find.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Find.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/LessThan.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/LessThan.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/LessThan.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/LessThan.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Matches.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Matches.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Matches.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Matches.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Not.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Not.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Not.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Not.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/NotNull.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/NotNull.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/NotNull.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/NotNull.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Null.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Null.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Null.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Null.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Or.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Or.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Or.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Or.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Same.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Same.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/Same.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/Same.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/StartsWith.java easymock-3.6/core/src/main/java/org/easymock/internal/matchers/StartsWith.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/matchers/StartsWith.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/matchers/StartsWith.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java easymock-3.6/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MockBuilder.java easymock-3.6/core/src/main/java/org/easymock/internal/MockBuilder.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MockBuilder.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/MockBuilder.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,14 +15,19 @@
*/
package org.easymock.internal;
+import org.easymock.ConstructorArgs;
+import org.easymock.EasyMock;
+import org.easymock.EasyMockSupport;
+import org.easymock.IMockBuilder;
+import org.easymock.IMocksControl;
+import org.easymock.MockType;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.HashSet;
import java.util.Set;
-import org.easymock.*;
-
/**
* Default implementation of IMockBuilder.
*
@@ -36,6 +41,23 @@
*/
public class MockBuilder implements IMockBuilder {
+ private static final ReflectionUtils.Predicate CAN_BE_MOCKED = new ReflectionUtils.Predicate() {
+ @Override
+ public boolean test(Method method) {
+ int modifiers = method.getModifiers();
+ // Final, static and private methods can't be mocked so just skip
+ if((modifiers & (Modifier.STATIC | Modifier.PRIVATE | Modifier.FINAL)) != 0) {
+ return false;
+ }
+ // synthetic methods like bridges, lamdbas or whatever might be invented by the compile can't be mocked
+ // since they do not really exists from the user perspective (they are not in the source code)
+ if(method.isSynthetic()) {
+ return false;
+ }
+ return true;
+ }
+ };
+
private final Class toMock;
private Set mockedMethods;
@@ -65,8 +87,8 @@
}
public IMockBuilder addMockedMethod(Method method) {
- if (Modifier.isFinal(method.getModifiers())) {
- throw new IllegalArgumentException("Final methods can't be mocked");
+ if(method == null || !CAN_BE_MOCKED.test(method)) {
+ throw new IllegalArgumentException("Method is not found, null, final, private or synthetic and so can't be mocked");
}
if (mockedMethods == null) {
mockedMethods = new HashSet();
@@ -76,19 +98,13 @@
}
public IMockBuilder addMockedMethod(String methodName) {
- Method m = ReflectionUtils.findMethod(toMock, methodName);
- if (m == null) {
- throw new IllegalArgumentException("Method not found (or private): " + methodName);
- }
+ Method m = ReflectionUtils.findMethod(toMock, methodName, CAN_BE_MOCKED);
addMockedMethod(m);
return this;
}
public IMockBuilder addMockedMethod(String methodName, Class>... parameterTypes) {
- Method m = ReflectionUtils.findMethod(toMock, methodName, parameterTypes);
- if (m == null) {
- throw new IllegalArgumentException("Method not found (or private): " + methodName);
- }
+ Method m = ReflectionUtils.findMethod(toMock, methodName, CAN_BE_MOCKED, parameterTypes);
addMockedMethod(m);
return this;
}
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MockInvocationHandler.java easymock-3.6/core/src/main/java/org/easymock/internal/MockInvocationHandler.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MockInvocationHandler.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/MockInvocationHandler.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MocksBehavior.java easymock-3.6/core/src/main/java/org/easymock/internal/MocksBehavior.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MocksBehavior.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/MocksBehavior.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MocksControl.java easymock-3.6/core/src/main/java/org/easymock/internal/MocksControl.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/MocksControl.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/MocksControl.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,11 +63,15 @@
DEFAULT(org.easymock.MockType.DEFAULT),
STRICT(org.easymock.MockType.STRICT);
- public org.easymock.MockType realType;
+ private org.easymock.MockType realType;
MockType(org.easymock.MockType realType) {
this.realType = realType;
}
+
+ public org.easymock.MockType getRealType() {
+ return realType;
+ }
}
private org.easymock.MockType type;
@@ -103,6 +107,9 @@
@Override
public T createMock(String name, Class toMock, ConstructorArgs constructorArgs,
Method... mockedMethods) {
+ if (toMock == null) {
+ throw new NullPointerException("Can't mock 'null'");
+ }
if (toMock.isInterface() && mockedMethods != null) {
throw new IllegalArgumentException("Partial mocking doesn't make sense for interface");
}
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java easymock-3.6/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
/**
* @author OFFIS, Tammo Freese
@@ -28,6 +29,13 @@
private static final long serialVersionUID = -1726286682930686024L;
+ private static final ReflectionUtils.Predicate NOT_PRIVATE = new ReflectionUtils.Predicate() {
+ @Override
+ public boolean test(Method method) {
+ return !Modifier.isPrivate(method.getModifiers());
+ }
+ };
+
private transient Method equalsMethod;
private transient Method hashCodeMethod;
@@ -56,7 +64,7 @@
equalsMethod = extractMethod(toMock, "equals", Object.class);
hashCodeMethod = extractMethod(toMock, "hashCode", (Class[]) null);
toStringMethod = extractMethod(toMock, "toString", (Class[]) null);
- finalizeMethod = ReflectionUtils.findMethod(toMock, "finalize", (Class[]) null);
+ finalizeMethod = ReflectionUtils.findMethod(toMock, "finalize", NOT_PRIVATE, (Class[]) null);
} catch (NoSuchMethodException e) {
// ///CLOVER:OFF
throw new RuntimeException("An Object method could not be found!", e);
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java easymock-3.6/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/PrimitiveUtils.java easymock-3.6/core/src/main/java/org/easymock/internal/PrimitiveUtils.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/PrimitiveUtils.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/PrimitiveUtils.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Range.java easymock-3.6/core/src/main/java/org/easymock/internal/Range.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Range.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Range.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/RecordState.java easymock-3.6/core/src/main/java/org/easymock/internal/RecordState.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/RecordState.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/RecordState.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ReflectionUtils.java easymock-3.6/core/src/main/java/org/easymock/internal/ReflectionUtils.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ReflectionUtils.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ReflectionUtils.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,17 @@
*/
public final class ReflectionUtils {
+ public interface Predicate {
+ boolean test(T t);
+ }
+
+ public static final Predicate NOT_PRIVATE = new Predicate() {
+ @Override
+ public boolean test(Method method) {
+ return !Modifier.isPrivate(method.getModifiers());
+ }
+ };
+
private static final Map, Class>> primitiveToWrapperType = new HashMap, Class>>(8);
static {
@@ -58,7 +69,8 @@
/**
* Attempt to find a {@link Method} on the supplied class with the supplied
* name and no parameters. Searches all superclasses up to
- * {@code Object}.
+ * {@code Object}. The filter is used to ignore some kind of methods the caller doesn't want to see returned. In this case
+ * they are totally ignored and can't clash with a non-ignored one to cause ambiguity.
*
* Returns {@code null} if no {@link Method} can be found.
*
@@ -66,16 +78,19 @@
* the class to introspect
* @param name
* the name of the method
+ * @param filter
+ * tells what methods to ignore in the research
* @return the Method object, or {@code null} if none found
*/
- public static Method findMethod(Class> clazz, String name) {
- return findMethod(clazz, name, (Class>[]) null);
+ public static Method findMethod(Class> clazz, String name, Predicate filter) {
+ return findMethod(clazz, name, filter, (Class>[]) null);
}
/**
* Attempt to find a {@link Method} on the supplied class with the supplied
* name and parameter types. Searches all superclasses up to
- * {@code Object}.
+ * {@code Object}. The filter is used to ignore some kind of methods the caller doesn't want to see returned. In this case
+ * they are totally ignored and can't clash with a non-ignored one to cause ambiguity.
*
* Returns {@code null} if no {@link Method} can be found.
*
@@ -83,19 +98,21 @@
* the class to introspect
* @param name
* the name of the method
+ * @param filter
+ * tells what methods to ignore in the research
* @param paramTypes
* the parameter types of the method (may be {@code null} to
* indicate any signature)
* @return the Method object, or {@code null} if none found
*/
- public static Method findMethod(Class> clazz, String name, Class>... paramTypes) {
+ public static Method findMethod(Class> clazz, String name, Predicate filter, Class>... paramTypes) {
Class> searchType = clazz;
while (searchType != null) {
Method[] methods = searchType.getDeclaredMethods();
Method result = null;
for (Method method : methods) {
// Private methods can't be mocked so just skip them
- if (Modifier.isPrivate(method.getModifiers())) {
+ if (!filter.test(method)) {
continue;
}
// Skip bridges because we never mock them. We mock the method underneath
@@ -119,9 +136,43 @@
}
searchType = searchType.getSuperclass();
}
+ // Nothing found, our last hope is a default method
+ searchType = clazz;
+ while (searchType != Object.class) {
+ Method method = findDefaultMethod(searchType, name, paramTypes);
+ if(method != null) {
+ return method;
+ }
+ searchType = searchType.getSuperclass();
+ }
return null;
}
+ private static Method findDefaultMethod(Class> searchedClass, String name, Class>[] paramTypes) {
+ Class>[] interfaces = searchedClass.getInterfaces();
+ Method result = null;
+ for(Class> i : interfaces) {
+ Method[] methods = i.getDeclaredMethods();
+ for (Method method : methods) {
+ if(!isDefaultMethod(method)) {
+ continue;
+ }
+ if (name.equals(method.getName())) {
+ if (paramTypes == null) {
+ if (result != null) {
+ throw new RuntimeException("Ambiguous name: More than one method are named "
+ + name);
+ }
+ result = method; // match, remember it to see if it's ambiguous
+ } else if (Arrays.equals(paramTypes, method.getParameterTypes())) {
+ return method; // perfect match, get out now
+ }
+ }
+ }
+ }
+ return result;
+ }
+
/**
* Returns a constructor that contains {@code objs} as arguments.
*
@@ -245,4 +296,11 @@
}
return true;
}
+
+ public static boolean isDefaultMethod(Method method) {
+ int modifiers = method.getModifiers();
+ // Default methods are public non-abstract instance methods
+ // declared in an interface.
+ return (modifiers & (Modifier.ABSTRACT | Modifier.PUBLIC | Modifier.STATIC)) == Modifier.PUBLIC;
+ }
}
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ReplayState.java easymock-3.6/core/src/main/java/org/easymock/internal/ReplayState.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ReplayState.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ReplayState.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Result.java easymock-3.6/core/src/main/java/org/easymock/internal/Result.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Result.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Result.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Results.java easymock-3.6/core/src/main/java/org/easymock/internal/Results.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/Results.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/Results.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java easymock-3.6/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ThrowableWrapper.java easymock-3.6/core/src/main/java/org/easymock/internal/ThrowableWrapper.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/ThrowableWrapper.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/ThrowableWrapper.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/UnorderedBehavior.java easymock-3.6/core/src/main/java/org/easymock/internal/UnorderedBehavior.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/internal/UnorderedBehavior.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/internal/UnorderedBehavior.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/LogicalOperator.java easymock-3.6/core/src/main/java/org/easymock/LogicalOperator.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/LogicalOperator.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/LogicalOperator.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/Mock.java easymock-3.6/core/src/main/java/org/easymock/Mock.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/Mock.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/Mock.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/MockType.java easymock-3.6/core/src/main/java/org/easymock/MockType.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/MockType.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/MockType.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/main/java/org/easymock/TestSubject.java easymock-3.6/core/src/main/java/org/easymock/TestSubject.java
--- easymock-3.5.1+ds/core/src/main/java/org/easymock/TestSubject.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/main/java/org/easymock/TestSubject.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ClassTested.java easymock-3.6/core/src/samples/java/org/easymock/samples/ClassTested.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ClassTested.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/ClassTested.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/Collaborator.java easymock-3.6/core/src/samples/java/org/easymock/samples/Collaborator.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/Collaborator.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/Collaborator.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/EnclosedTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/EnclosedTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/EnclosedTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/EnclosedTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ExampleTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/ExampleTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ExampleTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/ExampleTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/SupportTest.java easymock-3.6/core/src/samples/java/org/easymock/samples/SupportTest.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/SupportTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/SupportTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ThrowableEquals.java easymock-3.6/core/src/samples/java/org/easymock/samples/ThrowableEquals.java
--- easymock-3.5.1+ds/core/src/samples/java/org/easymock/samples/ThrowableEquals.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/samples/java/org/easymock/samples/ThrowableEquals.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java easymock-3.6/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java easymock-3.6/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java easymock-3.6/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java easymock-3.6/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/CglibTest.java easymock-3.6/core/src/test/java/org/easymock/tests/CglibTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/CglibTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/CglibTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ConstructorTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ConstructorTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ConstructorTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ConstructorTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java easymock-3.6/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ErrorMessageTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ErrorMessageTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ErrorMessageTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ErrorMessageTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/FinalEqualsTest.java easymock-3.6/core/src/test/java/org/easymock/tests/FinalEqualsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/FinalEqualsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/FinalEqualsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/GenericTest.java easymock-3.6/core/src/test/java/org/easymock/tests/GenericTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/GenericTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/GenericTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/IMethods.java easymock-3.6/core/src/test/java/org/easymock/tests/IMethods.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/IMethods.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/IMethods.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/InvocationTest.java easymock-3.6/core/src/test/java/org/easymock/tests/InvocationTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/InvocationTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/InvocationTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/IVarArgs.java easymock-3.6/core/src/test/java/org/easymock/tests/IVarArgs.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/IVarArgs.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/IVarArgs.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/LimitationsTest.java easymock-3.6/core/src/test/java/org/easymock/tests/LimitationsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/LimitationsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/LimitationsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockClassControlTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MockClassControlTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockClassControlTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MockClassControlTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockingTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MockingTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockingTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MockingTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
/**
* Test all kind of mocking making sure the partial mocking and interface works
* and that to correct behavior is given.
- *
+ *
* @author Henri Tremblay
*/
public class MockingTest {
@@ -89,6 +89,16 @@
checkClassMocking(createNiceMock(ClassToMock.class), MockType.NICE);
}
+ @Test
+ public void testMockingNull() {
+ try {
+ createMock(null);
+ fail("Should throw a NPE");
+ } catch(NullPointerException e) {
+ assertEquals("Can't mock 'null'", e.getMessage());
+ }
+ }
+
private void checkInterfaceMock(Object mock, MockType behavior) {
checkBehavior(mock, behavior);
}
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockNameTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MockNameTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockNameTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MockNameTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockTypeTest.java easymock-3.6/core/src/test/java/org/easymock/tests/MockTypeTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/MockTypeTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/MockTypeTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/NiceMockControlTest.java easymock-3.6/core/src/test/java/org/easymock/tests/NiceMockControlTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/NiceMockControlTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/NiceMockControlTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ResultTest.java easymock-3.6/core/src/test/java/org/easymock/tests/ResultTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/ResultTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/ResultTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/StacktraceTest.java easymock-3.6/core/src/test/java/org/easymock/tests/StacktraceTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/StacktraceTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/StacktraceTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageCallCountTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageCallCountTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageCallCountTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageCallCountTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageRangeTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageRangeTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageRangeTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageRangeTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageThrowableTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageThrowableTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageThrowableTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageThrowableTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageVarargTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageVarargTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageVarargTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageVarargTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageVerifyTest.java easymock-3.6/core/src/test/java/org/easymock/tests/UsageVerifyTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/UsageVerifyTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/UsageVerifyTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/Util.java easymock-3.6/core/src/test/java/org/easymock/tests/Util.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests/Util.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests/Util.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/AnswerTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/AnswerTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/AnswerTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/AnswerTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CallbackTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/CallbackTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CallbackTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/CallbackTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CaptureTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/CaptureTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CaptureTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/CaptureTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ChildEquals.java easymock-3.6/core/src/test/java/org/easymock/tests2/ChildEquals.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ChildEquals.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ChildEquals.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CompareToTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/CompareToTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/CompareToTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/CompareToTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/DelegateToTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/DelegateToTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/DelegateToTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/DelegateToTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MockBuilderTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/MockBuilderTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MockBuilderTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/MockBuilderTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,25 +91,26 @@
builder.addMockedMethod("..", String.class);
}
+ private static final String errorMessage = "Method is not found, null, final, private or synthetic and so can't be mocked";
+
@Test
public void testAddMethod_Final() throws Exception {
- String errorMessage = "Final methods can't be mocked";
MockBuilder builder = new MockBuilder(A.class);
try {
builder.addMockedMethod(A.class.getMethod("foo", String.class));
- fail("sholdn't be allowed to be mocked");
+ fail("shouldn't be allowed to be mocked");
} catch (IllegalArgumentException e) {
assertEquals(errorMessage, e.getMessage());
}
try {
builder.addMockedMethod("foo");
- fail("sholdn't be allowed to be mocked");
+ fail("shouldn't be allowed to be mocked");
} catch (IllegalArgumentException e) {
assertEquals(errorMessage, e.getMessage());
}
try {
builder.addMockedMethod("foo", String.class);
- fail("sholdn't be allowed to be mocked");
+ fail("shouldn't be allowed to be mocked");
} catch (IllegalArgumentException e) {
assertEquals(errorMessage, e.getMessage());
}
@@ -117,17 +118,16 @@
@Test
public void testAddMethods_Final() throws Exception {
- String errorMessage = "Final methods can't be mocked";
MockBuilder builder = new MockBuilder(A.class);
try {
builder.addMockedMethods(A.class.getMethod("foo", String.class));
- fail("sholdn't be allowed to be mocked");
+ fail("shouldn't be allowed to be mocked");
} catch (IllegalArgumentException e) {
assertEquals(errorMessage, e.getMessage());
}
try {
builder.addMockedMethods("foo");
- fail("sholdn't be allowed to be mocked");
+ fail("shouldn't be allowed to be mocked");
} catch (IllegalArgumentException e) {
assertEquals(errorMessage, e.getMessage());
}
@@ -351,5 +351,4 @@
public int myMethod(int i) {
return i;
}
-
}
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MocksControlTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/MocksControlTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/MocksControlTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/MocksControlTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,19 +15,19 @@
*/
package org.easymock.tests2;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
import org.easymock.ConstructorArgs;
import org.easymock.IMocksControl;
import org.easymock.MockType;
import org.easymock.internal.MocksControl;
import org.junit.Test;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
/**
* @author Henri Tremblay
*/
@@ -183,7 +183,7 @@
@Test
@SuppressWarnings("deprecation")
public void testCreateOldMockTypeFromNewMockType() {
- assertSame(MockType.NICE, MocksControl.MockType.NICE.realType);
+ assertSame(MockType.NICE, MocksControl.MockType.NICE.getRealType());
}
@Test
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/NameTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/NameTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/NameTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/NameTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/NiceMockTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/NiceMockTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/NiceMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/NiceMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ParentEquals.java easymock-3.6/core/src/test/java/org/easymock/tests2/ParentEquals.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ParentEquals.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ParentEquals.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/PartialMockingTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/PartialMockingTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/PartialMockingTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/PartialMockingTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,11 +16,15 @@
package org.easymock.tests2;
import org.easymock.internal.ReflectionUtils;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import static org.easymock.internal.ReflectionUtils.*;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
@@ -28,82 +32,43 @@
*/
public class ReflectionUtilsTest {
+ private static final Class[] NO_PARAMS = new Class[0];
+
public static class B {
- protected void foo(long l) {
- }
+ protected void foo(long l) { }
+
+ public void parentMethod() {}
}
public static class A extends B {
- public A(boolean bool, byte b, int i, short s, char c, long l,
- float f, double d) {
- }
+ public A(boolean bool, byte b, int i, short s, char c, long l, float f, double d) { }
- public A(int i) {
- }
+ public A(int i) { }
- protected A(long l) {
- }
+ protected A(long l) { }
- private A(byte b) {
- }
+ private A(byte b) { }
- A(char c) {
- }
+ A(char c) { }
- public A(CharSequence c) {
- }
+ public A(CharSequence c) { }
- public A(StringBuilder s) {
- }
+ public A(StringBuilder s) { }
- public void foo(String s) {
- }
+ public void foo(int i) {}
- public void foo(int i) {
- }
- }
+ public static void staticMethod() {}
- @Test
- public void testFindMethod() {
- Method m = ReflectionUtils.findMethod(String.class, "length");
- assertSame(String.class, m.getDeclaringClass());
- assertEquals("length", m.getName());
- assertSame(int.class, m.getReturnType());
- }
+ private void privateMethod() {}
- @Test
- public void testFindMethod_NotFound() {
- Method m = ReflectionUtils.findMethod(String.class, "aaa");
- assertNull(m);
- }
+ protected void protectedMethod() {}
- @Test
- public void testFindMethod_Ambiguous() {
- try {
- ReflectionUtils.findMethod(A.class, "foo");
- } catch (RuntimeException e) {
- assertEquals("Ambiguous name: More than one method are named foo", e.getMessage());
- }
+ void packageMethod() {}
}
- @Test
- public void testFindMethod_WrongParams() {
- Method m = ReflectionUtils.findMethod(A.class, "foo", int.class, int.class);
- assertNull(m);
- }
-
- @Test
- public void testFindMethod_Superclass() {
- Method m = ReflectionUtils.findMethod(A.class, "foo", long.class);
- assertEquals("protected void " + B.class.getName() + ".foo(long)", m.toString());
- }
-
- @Test
- public void testFindMethodClassOfQStringClassOfQArray() {
- Method m = ReflectionUtils.findMethod(A.class, "foo", int.class);
- assertEquals("public void " + A.class.getName() + ".foo(int)", m.toString());
- }
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
@Test
public void testGetConstructor_public() throws NoSuchMethodException {
@@ -123,23 +88,27 @@
assertArrayEquals(new Class[] { char.class }, c.getParameterTypes());
}
- @Test(expected = NoSuchMethodException.class)
+ @Test
public void testGetConstructor_private() throws NoSuchMethodException {
+ expectedException.expect(NoSuchMethodException.class);
ReflectionUtils.getConstructor(A.class, (byte) 5);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetConstructor_twoMatching() throws NoSuchMethodException {
+ expectedException.expect(IllegalArgumentException.class);
ReflectionUtils.getConstructor(A.class, new StringBuilder());
}
- @Test(expected = NoSuchMethodException.class)
+ @Test
public void testGetConstructor_notFound() throws NoSuchMethodException {
+ expectedException.expect(NoSuchMethodException.class);
ReflectionUtils.getConstructor(A.class, true);
}
- @Test(expected = NoSuchMethodException.class)
+ @Test
public void testGetConstructor_WrongParams() throws NoSuchMethodException {
+ expectedException.expect(NoSuchMethodException.class);
ReflectionUtils.getConstructor(A.class, "", "");
}
@@ -159,12 +128,8 @@
@Test
public void testGetDeclareMethod_NotFound() {
- try {
- ReflectionUtils.getDeclaredMethod(A.class, "foo", new Class>[0]);
- fail("Method should not be found");
- } catch (RuntimeException e) {
- assertTrue(e.getCause() instanceof NoSuchMethodException);
- }
+ expectedException.expectCause(isA(NoSuchMethodException.class));
+ ReflectionUtils.getDeclaredMethod(A.class, "foo", new Class>[0]);
}
@Test
@@ -172,4 +137,48 @@
assertTrue(ReflectionUtils.isClassAvailable("org.easymock.EasyMock"));
assertFalse(ReflectionUtils.isClassAvailable("org.easymock.NotThere"));
}
+
+ @Test
+ public void testFindMethodWithParam_notFound() {
+ assertNull(ReflectionUtils.findMethod(getClass(), "xxx", NOT_PRIVATE, int.class));
+ }
+
+ @Test
+ public void testFindMethodWithParam_foundDirectlyOnClass() {
+ Method method = ReflectionUtils.findMethod(A.class, "foo", NOT_PRIVATE, int.class);
+ assertEquals("foo", method.getName());
+ assertEquals(A.class, method.getDeclaringClass());
+ }
+
+ @Test
+ public void testFindMethodWithParam_foundDirectlyOnClassButWithDifferentParams() {
+ assertNull(ReflectionUtils.findMethod(getClass(), "foo", NOT_PRIVATE, double.class));
+ assertNull(ReflectionUtils.findMethod(getClass(), "foo", NOT_PRIVATE, int.class, int.class));
+ }
+
+ @Test
+ public void testFindMethodWithParam_privateMethodsIgnored() {
+ assertNull(ReflectionUtils.findMethod(A.class, "privateMethod", NOT_PRIVATE, NO_PARAMS));
+ }
+
+ @Test
+ public void testFindMethodWithParam_protectedMethodsFound() {
+ Method method = ReflectionUtils.findMethod(A.class, "protectedMethod", NOT_PRIVATE, NO_PARAMS);
+ assertEquals("protectedMethod", method.getName());
+ assertEquals(A.class, method.getDeclaringClass());
+ }
+
+ @Test
+ public void testFindMethodWithParam_packageMethodsFound() {
+ Method method = ReflectionUtils.findMethod(A.class, "packageMethod", NOT_PRIVATE, NO_PARAMS);
+ assertEquals("packageMethod", method.getName());
+ assertEquals(A.class, method.getDeclaringClass());
+ }
+
+ @Test
+ public void testFindMethodWithParam_parentMethodsFound() {
+ Method method = ReflectionUtils.findMethod(A.class, "parentMethod", NOT_PRIVATE, NO_PARAMS);
+ assertEquals("parentMethod", method.getName());
+ assertEquals(B.class, method.getDeclaringClass());
+ }
}
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/SerializationTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/SerializationTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/SerializationTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/SerializationTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/StubTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/StubTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/StubTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/StubTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ThreadingTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/ThreadingTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/ThreadingTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/ThreadingTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageTest.java easymock-3.6/core/src/test/java/org/easymock/tests2/UsageTest.java
--- easymock-3.5.1+ds/core/src/test/java/org/easymock/tests2/UsageTest.java 2017-11-16 05:12:02.000000000 +0000
+++ easymock-3.6/core/src/test/java/org/easymock/tests2/UsageTest.java 2018-04-09 03:26:33.000000000 +0000
@@ -1,5 +1,5 @@
/**
- * Copyright 2001-2017 the original author or authors.
+ * Copyright 2001-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -Nru easymock-3.5.1+ds/debian/changelog easymock-3.6/debian/changelog
--- easymock-3.5.1+ds/debian/changelog 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/changelog 2018-04-12 17:58:32.000000000 +0000
@@ -1,3 +1,14 @@
+easymock (3.6-1) unstable; urgency=medium
+
+ * New upstream version 3.6.
+ * Update copyright years.
+ * Declare compliance with Debian Policy 4.1.4.
+ * Use compat level 11.
+ * Build-depend on libmaven-enforcer-plugin-java.
+ * Rebase no-android.patch.
+
+ -- Markus Koschany Thu, 12 Apr 2018 19:58:32 +0200
+
easymock (3.5.1+ds-1) unstable; urgency=medium
* New upstream version 3.5.1+ds.
diff -Nru easymock-3.5.1+ds/debian/compat easymock-3.6/debian/compat
--- easymock-3.5.1+ds/debian/compat 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/compat 2018-04-12 17:58:32.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru easymock-3.5.1+ds/debian/control easymock-3.6/debian/control
--- easymock-3.5.1+ds/debian/control 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/control 2018-04-12 17:58:32.000000000 +0000
@@ -5,16 +5,17 @@
Uploaders:
Markus Koschany
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
default-jdk,
junit4,
libcglib-java,
libmaven-bundle-plugin-java,
+ libmaven-enforcer-plugin-java,
libmaven-javadoc-plugin-java,
libobjenesis-java,
maven-debian-helper,
testng
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
Vcs-Git: https://anonscm.debian.org/git/pkg-java/easymock.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/easymock.git
Homepage: http://www.easymock.org
diff -Nru easymock-3.5.1+ds/debian/copyright easymock-3.6/debian/copyright
--- easymock-3.5.1+ds/debian/copyright 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/copyright 2018-04-12 17:58:32.000000000 +0000
@@ -8,7 +8,7 @@
.gitignore
Files: *
-Copyright: 2001-2017, OFFIS, Tammo Freese, Henri Tremblay
+Copyright: 2001-2018, OFFIS, Tammo Freese, Henri Tremblay
License: Apache-2.0
Files: debian/*
@@ -16,7 +16,7 @@
2009, Damien Raude-Morvan
2010-2011, Torsten Werner
2012, Niels Thykier
- 2013-2017, Markus Koschany
+ 2013-2018, Markus Koschany
License: Apache-2.0
License: Apache-2.0
diff -Nru easymock-3.5.1+ds/debian/libeasymock-java.poms easymock-3.6/debian/libeasymock-java.poms
--- easymock-3.5.1+ds/debian/libeasymock-java.poms 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/libeasymock-java.poms 2018-04-12 17:58:32.000000000 +0000
@@ -32,5 +32,6 @@
test-nodeps/pom.xml --ignore
test-android/pom.xml --ignore
test-testng/pom.xml --ignore
+test-java8/pom.xml --ignore
bench/pom.xml --ignore
test-deploy/pom.xml --ignore
diff -Nru easymock-3.5.1+ds/debian/maven.ignoreRules easymock-3.6/debian/maven.ignoreRules
--- easymock-3.5.1+ds/debian/maven.ignoreRules 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/maven.ignoreRules 2018-04-12 17:58:32.000000000 +0000
@@ -33,3 +33,5 @@
org.springframework.osgi spring-osgi-test * * * *
org.apache.maven.plugins maven-shade-plugin * * * *
org.droidparts.dexmaker dexmaker * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
+org.codehaus.mojo.signature java16 * * * *
diff -Nru easymock-3.5.1+ds/debian/patches/no-android.patch easymock-3.6/debian/patches/no-android.patch
--- easymock-3.5.1+ds/debian/patches/no-android.patch 2017-11-19 14:28:46.000000000 +0000
+++ easymock-3.6/debian/patches/no-android.patch 2018-04-12 17:58:32.000000000 +0000
@@ -1,10 +1,7 @@
From: Markus Koschany
-Date: Fri, 15 Sep 2017 07:21:43 +0200
+Date: Thu, 12 Apr 2018 20:13:25 +0200
Subject: no android
-The dexmaker library has not been packaged yet.
-
-Forwarded: not-needed
---
.../internal/AndroidClassProxyFactory.java | 101 ---------------------
.../java/org/easymock/internal/MocksControl.java | 3 -
@@ -13,12 +10,12 @@
diff --git a/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java b/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
deleted file mode 100644
-index 00adee9..0000000
+index 16243eb..0000000
--- a/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
-- * Copyright 2001-2017 the original author or authors.
+- * Copyright 2001-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
@@ -119,10 +116,10 @@
-}
-// ///CLOVER:ON
diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java
-index fb2a5dc..aae9f97 100644
+index c328735..a096fdf 100644
--- a/core/src/main/java/org/easymock/internal/MocksControl.java
+++ b/core/src/main/java/org/easymock/internal/MocksControl.java
-@@ -148,9 +148,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters