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.easymock easymock-parent - 3.5.1 + 3.6 easymock-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.easymock easymock-parent - 3.5.1 + 3.6 easymock @@ -35,7 +35,7 @@ cglib cglib - 3.2.5 + 3.2.6 org.apache.ant @@ -43,11 +43,11 @@ - + org.ow2.asm asm - 6.0 + 6.1.1 runtime @@ -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, +@@ -155,9 +155,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, } // ///CLOVER:OFF diff -Nru easymock-3.5.1+ds/deploy-easymock.sh easymock-3.6/deploy-easymock.sh --- easymock-3.5.1+ds/deploy-easymock.sh 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/deploy-easymock.sh 2018-04-09 03:26:33.000000000 +0000 @@ -58,12 +58,13 @@ pause echo "Generate the changelog" -if [ $(curl -s -u "${github_user}:${github_password}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/easymock/easymock/issues?milestone=$version&state=open" | wc -l) != "3" ]; then +milestone=$(curl -s -u "${github_user}:${github_password}" "https://api.github.com/repos/easymock/easymock/milestones" | jq ".[] | select(.title==\"$version\") | .number") +if [ $(curl -s -u "${github_user}:${github_password}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/easymock/easymock/issues?milestone=$milestone&state=open" | wc -l) != "3" ]; then echo "There are unclosed issues on milestone $version. Please fix them or moved them to a later release" exit 1 fi -./generate-changelog.sh easymock/easymock ${version} ${github_user} ${github_password} >> ReleaseNotes.md +./generate-changelog.sh easymock/easymock ${milestone} ${github_user} ${github_password} >> ReleaseNotes.md echo "Check the release notes" pause diff -Nru easymock-3.5.1+ds/findbugs-exclude.xml easymock-3.6/findbugs-exclude.xml --- easymock-3.5.1+ds/findbugs-exclude.xml 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/findbugs-exclude.xml 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,2 @@ + + diff -Nru easymock-3.5.1+ds/pom.xml easymock-3.6/pom.xml --- easymock-3.5.1+ds/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -5,7 +5,7 @@ 4.0.0 org.easymock easymock-parent - 3.5.1 + 3.6 pom EasyMock Parent http://easymock.org @@ -74,7 +74,7 @@ org.testng testng - 6.9.10 + 6.14.2 @@ -188,7 +188,7 @@ maven-javadoc-plugin - 3.0.0-M1 + 3.0.0 maven-resources-plugin @@ -196,7 +196,7 @@ maven-site-plugin - 3.6 + 3.7 maven-source-plugin @@ -204,18 +204,23 @@ maven-surefire-plugin - 2.20 + 2.21.0 org.apache.maven.surefire surefire-junit47 - 2.20 + 2.21.0 org.codehaus.mojo + animal-sniffer-maven-plugin + 1.16 + + + org.codehaus.mojo findbugs-maven-plugin 3.0.5 @@ -226,7 +231,7 @@ org.jacoco jacoco-maven-plugin - 0.7.2.201409121644 + 0.8.1 @@ -245,7 +250,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.0 + 3.1.1 @@ -382,6 +387,25 @@ true + + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + + [3.2.1,) + + + + + + @@ -410,7 +434,7 @@ org.jacoco jacoco-maven-plugin - 0.7.9 + 0.8.1 org.codehaus.mojo @@ -451,6 +475,7 @@ test-osgi test-nodeps test-testng + test-java8 diff -Nru easymock-3.5.1+ds/README.md easymock-3.6/README.md --- easymock-3.5.1+ds/README.md 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/README.md 2018-04-09 03:26:33.000000000 +0000 @@ -21,8 +21,8 @@ ----------------- I'm using: -- IntelliJ 15 Ultimate (thanks to JetBrains for the license) -- Maven 3.3.9 +- IntelliJ 2017.3 Ultimate (thanks to JetBrains for the license) +- Maven 3.5.0 You can also use Eclipse. I tried - Eclipse 4.5.0 (Mars) @@ -129,7 +129,7 @@ - Make sure the poms are on the snapshot of the version you want to deploy - Launch and Android emulator or connect an Android phone - Make sure `jq` is installed. If not, try `brew install jq` or `choco install jq` -- Add a little speech on the features in "ReleaseNotes.md" (not the change log, it is generated) +- Add a little speech on the features in "ReleaseNotes.md" (remove the Change Log part, which will be regenerated automatically) - Set the github_user, github_password, gpg_passphrase, bintray_user, bintray_api_key as environment variables - Launch ./deploy-easymock.sh version - During the deployment, you will be asked to do different things. Do them diff -Nru easymock-3.5.1+ds/ReleaseNotes.md easymock-3.6/ReleaseNotes.md --- easymock-3.5.1+ds/ReleaseNotes.md 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/ReleaseNotes.md 2018-04-09 03:26:33.000000000 +0000 @@ -1,13 +1,13 @@ -This is a bug fix release of 3.5. It mainly fix dependency issues (ant in the classpath) caused by the latest -cglib release. +This release add support for Java 9 and Java 10 and fixes an issue for interface default methods. Release notes ------------- -* Remove ant from the classpath -* Put TestNG and JUnit in provided -* Pull ASM 6 out of beta +* Java 10 support through an update of ASM and cglib +* Add Java 9 automodule +* Allow to mock interface default methods on a partial mock Change log ---------- -* Easymock 3.5 is aliasing other packages on the classpath ([#207](https://github.com/easymock/easymock/issues/207)) -* Ant dependency is incorrectly packaged into easymock:jar:3.5 ([#205](https://github.com/easymock/easymock/issues/205)) +* Add Java 9 automodule ([#212](https://github.com/easymock/easymock/issues/212)) +* Update asm, cglib and surefire for Java 10 support ([#211](https://github.com/easymock/easymock/pull/211)) +* Mocking interface default methods ([#203](https://github.com/easymock/easymock/issues/203)) diff -Nru easymock-3.5.1+ds/test-android/pom.xml easymock-3.6/test-android/pom.xml --- easymock-3.5.1+ds/test-android/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-android/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -4,7 +4,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-android-tck @@ -147,7 +147,7 @@ android-maven-plugin - 25 + 27 true @@ -202,25 +202,6 @@ true - - - maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - [3.2.1,) - - - - - - diff -Nru easymock-3.5.1+ds/test-android/src/main/AndroidManifest.xml easymock-3.6/test-android/src/main/AndroidManifest.xml --- easymock-3.5.1+ds/test-android/src/main/AndroidManifest.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-android/src/main/AndroidManifest.xml 2018-04-09 03:26:33.000000000 +0000 @@ -30,7 +30,7 @@ + android:targetSdkVersion="27" /> diff -Nru easymock-3.5.1+ds/test-android/src/main/java/org/easymock/android/AndroidTck.java easymock-3.6/test-android/src/main/java/org/easymock/android/AndroidTck.java --- easymock-3.5.1+ds/test-android/src/main/java/org/easymock/android/AndroidTck.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-android/src/main/java/org/easymock/android/AndroidTck.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2013-2017 the original author or authors. + * Copyright 2013-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/test-deploy/pom.xml easymock-3.6/test-deploy/pom.xml --- easymock-3.5.1+ds/test-deploy/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-deploy/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-test-deploy diff -Nru easymock-3.5.1+ds/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java easymock-3.6/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java --- easymock-3.5.1+ds/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2013-2017 the original author or authors. + * Copyright 2013-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/test-integration/pom.xml easymock-3.6/test-integration/pom.xml --- easymock-3.5.1+ds/test-integration/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-integration/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-test-integration diff -Nru easymock-3.5.1+ds/test-integration/src/main/java/org/itests/StaticService.java easymock-3.6/test-integration/src/main/java/org/itests/StaticService.java --- easymock-3.5.1+ds/test-integration/src/main/java/org/itests/StaticService.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-integration/src/main/java/org/itests/StaticService.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-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/test-integration/src/test/java/org/itests/PowermockTest.java easymock-3.6/test-integration/src/test/java/org/itests/PowermockTest.java --- easymock-3.5.1+ds/test-integration/src/test/java/org/itests/PowermockTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-integration/src/test/java/org/itests/PowermockTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-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/test-java8/LICENSE.txt easymock-3.6/test-java8/LICENSE.txt --- easymock-3.5.1+ds/test-java8/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/LICENSE.txt 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -Nru easymock-3.5.1+ds/test-java8/pom.xml easymock-3.6/test-java8/pom.xml --- easymock-3.5.1+ds/test-java8/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,85 @@ + + + + + 4.0.0 + + + org.easymock + easymock-parent + 3.6 + + + easymock-test-java8 + jar + EasyMock Test Java 8 + EasyMock Test Java 8 is a test project making sure EasyMock is working with Java 8 specific features + 2018 + + + + henri + Henri Tremblay + http://blog.tremblay.pro/ + -5 + + + + + + true + 1.8 + + + + + org.easymock + easymock + ${project.version} + test + + + + + + + maven-deploy-plugin + + true + + + + org.codehaus.mojo + findbugs-maven-plugin + + true + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + true + + + + + + + + fullBuild + + + + com.mycila.maven-license-plugin + maven-license-plugin + + + + + + diff -Nru easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/IMethods.java easymock-3.6/test-java8/src/test/java/org/easymock/java8/IMethods.java --- easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/IMethods.java 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/src/test/java/org/easymock/java8/IMethods.java 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,28 @@ +/** + * Copyright 2018-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.easymock.java8; + +/** + * @author Henri Tremblay + */ +public interface IMethods { + + int normalInterfaceMethod(); + + default int defaultInterfaceMethod() { + return 1; + } +} diff -Nru easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/Java8Test.java easymock-3.6/test-java8/src/test/java/org/easymock/java8/Java8Test.java --- easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/Java8Test.java 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/src/test/java/org/easymock/java8/Java8Test.java 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,55 @@ +/** + * Copyright 2018-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.easymock.java8; + +import org.junit.Test; + +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + +/** + * @author Henri Tremblay + */ +public class Java8Test { + + @Test + public void noOverride() { + Class toMock = Methods.NoDefaultOverride.class; + partialMockOfDefaultMethod(toMock); + } + + @Test + public void defaultOverride() { + Class toMock = Methods.DefaultOverride.class; + partialMockOfDefaultMethod(toMock); + } + + @Test + public void baseClassOvverride() { + Class toMock = Methods.DefaultOverride.class; + partialMockOfDefaultMethod(toMock); + } + + private void partialMockOfDefaultMethod(Class toMock) { + IMethods mock = partialMockBuilder(toMock) + .addMockedMethod("defaultInterfaceMethod") + .createMock(); + expect(mock.defaultInterfaceMethod()).andReturn(10); + replay(mock); + assertEquals(10, mock.normalInterfaceMethod()); + verify(mock); + } +} diff -Nru easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/Methods.java easymock-3.6/test-java8/src/test/java/org/easymock/java8/Methods.java --- easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/Methods.java 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/src/test/java/org/easymock/java8/Methods.java 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,54 @@ +/** + * Copyright 2018-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.easymock.java8; + +/** + * @author Henri Tremblay + */ +public class Methods { + + public static class NoDefaultOverride implements IMethods { + @Override + public int normalInterfaceMethod() { + return defaultInterfaceMethod(); + } + } + + public static class DefaultOverride implements IMethods { + @Override + public int normalInterfaceMethod() { + return defaultInterfaceMethod(); + } + + @Override + public int defaultInterfaceMethod() { + return 2; + } + } + + public static class A { + public int defaultInterfaceMethod() { + return 3; + } + } + + public static class B extends A implements IMethods { + @Override + public int normalInterfaceMethod() { + return defaultInterfaceMethod(); + } + } +} diff -Nru easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java easymock-3.6/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java --- easymock-3.5.1+ds/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java 1970-01-01 00:00:00.000000000 +0000 +++ easymock-3.6/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -0,0 +1,54 @@ +/** + * Copyright 2018-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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.easymock.java8; + +import org.easymock.internal.ReflectionUtils; +import org.junit.Test; + +import java.lang.reflect.Method; + +import static org.easymock.internal.ReflectionUtils.*; +import static org.junit.Assert.*; + +/** + * @author Henri Tremblay + */ +public class ReflectionUtilsTest { + + private static final Class[] NO_PARAMS = new Class[0]; + private static final String DEFAULT_INTERFACE_METHOD = "defaultInterfaceMethod"; + + @Test + public void defaultOverride() throws Exception { + IMethods o = new Methods.DefaultOverride(); + Method method = ReflectionUtils.findMethod(o.getClass(), DEFAULT_INTERFACE_METHOD, NOT_PRIVATE, NO_PARAMS); + assertEquals(2, method.invoke(o)); + } + + @Test + public void noOverride() throws Exception { + IMethods o = new Methods.NoDefaultOverride(); + Method method = ReflectionUtils.findMethod(o.getClass(), DEFAULT_INTERFACE_METHOD, NOT_PRIVATE, NO_PARAMS); + assertEquals(1, method.invoke(o)); + } + + @Test + public void overrideOnBaseClass() throws Exception { + IMethods o = new Methods.B(); + Method method = ReflectionUtils.findMethod(o.getClass(), DEFAULT_INTERFACE_METHOD, NOT_PRIVATE, NO_PARAMS); + assertEquals(3, method.invoke(o)); + } +} diff -Nru easymock-3.5.1+ds/test-nodeps/pom.xml easymock-3.6/test-nodeps/pom.xml --- easymock-3.5.1+ds/test-nodeps/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-test-nodeps diff -Nru easymock-3.5.1+ds/test-nodeps/src/test/java/org/depends/Dependency.java easymock-3.6/test-nodeps/src/test/java/org/depends/Dependency.java --- easymock-3.5.1+ds/test-nodeps/src/test/java/org/depends/Dependency.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/src/test/java/org/depends/Dependency.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-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/test-nodeps/src/test/java/org/itests/DependencyTest.java easymock-3.6/test-nodeps/src/test/java/org/itests/DependencyTest.java --- easymock-3.5.1+ds/test-nodeps/src/test/java/org/itests/DependencyTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/src/test/java/org/itests/DependencyTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-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/test-nodeps/src/test/java/org/itests/FilteringRule.java easymock-3.6/test-nodeps/src/test/java/org/itests/FilteringRule.java --- easymock-3.5.1+ds/test-nodeps/src/test/java/org/itests/FilteringRule.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/src/test/java/org/itests/FilteringRule.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-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/test-nodeps/src/test/java/org/itests/NoDepsTest.java easymock-3.6/test-nodeps/src/test/java/org/itests/NoDepsTest.java --- easymock-3.5.1+ds/test-nodeps/src/test/java/org/itests/NoDepsTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/src/test/java/org/itests/NoDepsTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-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/test-nodeps/src/test/java/org/main/Main.java easymock-3.6/test-nodeps/src/test/java/org/main/Main.java --- easymock-3.5.1+ds/test-nodeps/src/test/java/org/main/Main.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-nodeps/src/test/java/org/main/Main.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-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/test-osgi/pom.xml easymock-3.6/test-osgi/pom.xml --- easymock-3.5.1+ds/test-osgi/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-osgi/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-test-osgi @@ -31,17 +31,6 @@ true - - - - - org.javassist - javassist - 3.21.0-GA - - - - org.easymock @@ -80,14 +69,14 @@ org.ops4j.pax.url pax-url-wrap - 2.5.2 + 2.5.4 org.apache.felix org.apache.felix.framework - 5.6.8 + 5.6.10 test diff -Nru easymock-3.5.1+ds/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java easymock-3.6/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java --- easymock-3.5.1+ds/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-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/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java easymock-3.6/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java --- easymock-3.5.1+ds/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-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/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java easymock-3.6/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java --- easymock-3.5.1+ds/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-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/test-testng/pom.xml easymock-3.6/test-testng/pom.xml --- easymock-3.5.1+ds/test-testng/pom.xml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-testng/pom.xml 2018-04-09 03:26:33.000000000 +0000 @@ -5,7 +5,7 @@ org.easymock easymock-parent - 3.5.1 + 3.6 easymock-test-testng @@ -19,12 +19,18 @@ + maven-deploy-plugin + + true + + + maven-surefire-plugin org.apache.maven.surefire surefire-testng - 2.20 + 2.21.0 diff -Nru easymock-3.5.1+ds/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java easymock-3.6/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java --- easymock-3.5.1+ds/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2010-2017 the original author or authors. + * Copyright 2010-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/test-testng/src/test/java/org/easymock/itests/IMethods.java easymock-3.6/test-testng/src/test/java/org/easymock/itests/IMethods.java --- easymock-3.5.1+ds/test-testng/src/test/java/org/easymock/itests/IMethods.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-testng/src/test/java/org/easymock/itests/IMethods.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2010-2017 the original author or authors. + * Copyright 2010-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/test-testng/src/test/java/org/easymock/itests/IVarArgs.java easymock-3.6/test-testng/src/test/java/org/easymock/itests/IVarArgs.java --- easymock-3.5.1+ds/test-testng/src/test/java/org/easymock/itests/IVarArgs.java 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/test-testng/src/test/java/org/easymock/itests/IVarArgs.java 2018-04-09 03:26:33.000000000 +0000 @@ -1,5 +1,5 @@ /** - * Copyright 2010-2017 the original author or authors. + * Copyright 2010-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/.travis.yml easymock-3.6/.travis.yml --- easymock-3.5.1+ds/.travis.yml 2017-11-16 05:12:02.000000000 +0000 +++ easymock-3.6/.travis.yml 2018-04-09 03:26:33.000000000 +0000 @@ -14,10 +14,10 @@ - unzip -n $HOME/android-sdk-dl/tools_r25.2.5-linux.zip -d $HOME/android-sdk # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism) - - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'tools' - - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' - - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;25.0.2' - - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-25' + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'tools' + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;27.0.1' + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-27' env: - ANDROID_HOME=$HOME/android-sdk script: