diff -Nru easymock-4.2/bench/pom.xml easymock-4.3/bench/pom.xml --- easymock-4.2/bench/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/bench/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -6,7 +6,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-bench @@ -17,7 +17,7 @@ UTF-8 - 1.23 + 1.29 benchmarks @@ -25,7 +25,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -114,6 +114,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java easymock-4.3/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java --- easymock-4.2/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/bench/src/main/java/org/easymock/benchmark/EasyMockBenchmark.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import org.openjdk.jmh.annotations.Warmup; @Fork(2) -@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS) -@Measurement(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS) +@Warmup(iterations = 10, time = 1) +@Measurement(iterations = 4, time = 1) @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Benchmark) diff -Nru easymock-4.2/core/pom.xml easymock-4.3/core/pom.xml --- easymock-4.2/core/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock @@ -25,7 +25,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -46,14 +46,14 @@ org.ow2.asm asm - 7.3.1 + 9.1 runtime org.objenesis objenesis - 3.1 + 3.2 @@ -173,7 +173,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.0.0-M4 + 3.0.0-M5 @@ -218,7 +218,7 @@ maven-assembly-plugin - 3.1.1 + 3.3.0 easymock-bundle diff -Nru easymock-4.2/core/.settings/org.eclipse.jdt.core.prefs easymock-4.3/core/.settings/org.eclipse.jdt.core.prefs --- easymock-4.2/core/.settings/org.eclipse.jdt.core.prefs 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/.settings/org.eclipse.jdt.core.prefs 2021-04-18 00:55:38.000000000 +0000 @@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore @@ -49,6 +50,7 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore diff -Nru easymock-4.2/core/src/main/java/org/easymock/Capture.java easymock-4.3/core/src/main/java/org/easymock/Capture.java --- easymock-4.2/core/src/main/java/org/easymock/Capture.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/Capture.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/CaptureType.java easymock-4.3/core/src/main/java/org/easymock/CaptureType.java --- easymock-4.2/core/src/main/java/org/easymock/CaptureType.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/CaptureType.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/ConstructorArgs.java easymock-4.3/core/src/main/java/org/easymock/ConstructorArgs.java --- easymock-4.2/core/src/main/java/org/easymock/ConstructorArgs.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/ConstructorArgs.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMockExtension.java easymock-4.3/core/src/main/java/org/easymock/EasyMockExtension.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMockExtension.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMockExtension.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMock.java easymock-4.3/core/src/main/java/org/easymock/EasyMock.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMock.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMock.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMockListener.java easymock-4.3/core/src/main/java/org/easymock/EasyMockListener.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMockListener.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMockListener.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMockRule.java easymock-4.3/core/src/main/java/org/easymock/EasyMockRule.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMockRule.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMockRule.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMockRunner.java easymock-4.3/core/src/main/java/org/easymock/EasyMockRunner.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMockRunner.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMockRunner.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/EasyMockSupport.java easymock-4.3/core/src/main/java/org/easymock/EasyMockSupport.java --- easymock-4.2/core/src/main/java/org/easymock/EasyMockSupport.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/EasyMockSupport.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/IAnswer.java easymock-4.3/core/src/main/java/org/easymock/IAnswer.java --- easymock-4.2/core/src/main/java/org/easymock/IAnswer.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/IAnswer.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/IArgumentMatcher.java easymock-4.3/core/src/main/java/org/easymock/IArgumentMatcher.java --- easymock-4.2/core/src/main/java/org/easymock/IArgumentMatcher.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/IArgumentMatcher.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/IExpectationSetters.java easymock-4.3/core/src/main/java/org/easymock/IExpectationSetters.java --- easymock-4.2/core/src/main/java/org/easymock/IExpectationSetters.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/IExpectationSetters.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/IMockBuilder.java easymock-4.3/core/src/main/java/org/easymock/IMockBuilder.java --- easymock-4.2/core/src/main/java/org/easymock/IMockBuilder.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/IMockBuilder.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/IMocksControl.java easymock-4.3/core/src/main/java/org/easymock/IMocksControl.java --- easymock-4.2/core/src/main/java/org/easymock/IMocksControl.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/IMocksControl.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java easymock-4.3/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java --- easymock-4.2/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/AndroidSupport.java easymock-4.3/core/src/main/java/org/easymock/internal/AndroidSupport.java --- easymock-4.2/core/src/main/java/org/easymock/internal/AndroidSupport.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/AndroidSupport.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ArgumentToString.java easymock-4.3/core/src/main/java/org/easymock/internal/ArgumentToString.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ArgumentToString.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ArgumentToString.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,12 +43,17 @@ buffer.append("'"); } else if (value.getClass().isArray()) { buffer.append("["); - for (int i = 0; i < Array.getLength(value); i++) { + int length = Array.getLength(value); + int printedLength = Math.min(100, length); + for (int i = 0; i < printedLength; i++) { if (i > 0) { buffer.append(", "); } appendArgument(Array.get(value, i), buffer); } + if(length > printedLength) { + buffer.append("... (length=").append(length).append(")"); + } buffer.append("]"); } else if (PrimitiveUtils.isPrimitiveWrapper(value.getClass())) { buffer.append(value) diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java easymock-4.3/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java --- easymock-4.2/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/AssertionErrorWrapper.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java easymock-4.3/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java --- easymock-4.2/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/BridgeMethodResolver.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java easymock-4.3/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ClassInstantiatorFactory.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ClassProxyFactory.java easymock-4.3/core/src/main/java/org/easymock/internal/ClassProxyFactory.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ClassProxyFactory.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ClassProxyFactory.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java easymock-4.3/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java --- easymock-4.2/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/DefaultClassInstantiator.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/EasyMockProperties.java easymock-4.3/core/src/main/java/org/easymock/internal/EasyMockProperties.java --- easymock-4.2/core/src/main/java/org/easymock/internal/EasyMockProperties.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/EasyMockProperties.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/EasyMockStatement.java easymock-4.3/core/src/main/java/org/easymock/internal/EasyMockStatement.java --- easymock-4.2/core/src/main/java/org/easymock/internal/EasyMockStatement.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/EasyMockStatement.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ErrorMessage.java easymock-4.3/core/src/main/java/org/easymock/internal/ErrorMessage.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ErrorMessage.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ErrorMessage.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResult.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocationAndResults.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocation.java easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocation.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ExpectedInvocation.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ExpectedInvocation.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/IClassInstantiator.java easymock-4.3/core/src/main/java/org/easymock/internal/IClassInstantiator.java --- easymock-4.2/core/src/main/java/org/easymock/internal/IClassInstantiator.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/IClassInstantiator.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/IMocksBehavior.java easymock-4.3/core/src/main/java/org/easymock/internal/IMocksBehavior.java --- easymock-4.2/core/src/main/java/org/easymock/internal/IMocksBehavior.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/IMocksBehavior.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/IMocksControlState.java easymock-4.3/core/src/main/java/org/easymock/internal/IMocksControlState.java --- easymock-4.2/core/src/main/java/org/easymock/internal/IMocksControlState.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/IMocksControlState.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Injection.java easymock-4.3/core/src/main/java/org/easymock/internal/Injection.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Injection.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Injection.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/InjectionPlan.java easymock-4.3/core/src/main/java/org/easymock/internal/InjectionPlan.java --- easymock-4.2/core/src/main/java/org/easymock/internal/InjectionPlan.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/InjectionPlan.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/InjectionTarget.java easymock-4.3/core/src/main/java/org/easymock/internal/InjectionTarget.java --- easymock-4.2/core/src/main/java/org/easymock/internal/InjectionTarget.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/InjectionTarget.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Injector.java easymock-4.3/core/src/main/java/org/easymock/internal/Injector.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Injector.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Injector.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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,7 +19,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Invocation.java easymock-4.3/core/src/main/java/org/easymock/internal/Invocation.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Invocation.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Invocation.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,7 +178,7 @@ private boolean toStringIsDefined(Object o) { try { - o.getClass().getDeclaredMethod("toString", (Class[]) null).getModifiers(); + o.getClass().getDeclaredMethod("toString", (Class[]) null).getModifiers(); return true; } catch (SecurityException | NoSuchMethodException ignored) { // ///CLOVER:OFF diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/IProxyFactory.java easymock-4.3/core/src/main/java/org/easymock/internal/IProxyFactory.java --- easymock-4.2/core/src/main/java/org/easymock/internal/IProxyFactory.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/IProxyFactory.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/JavaProxyFactory.java easymock-4.3/core/src/main/java/org/easymock/internal/JavaProxyFactory.java --- easymock-4.2/core/src/main/java/org/easymock/internal/JavaProxyFactory.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/JavaProxyFactory.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/LastControl.java easymock-4.3/core/src/main/java/org/easymock/internal/LastControl.java --- easymock-4.2/core/src/main/java/org/easymock/internal/LastControl.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/LastControl.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/LinkedClassLoader.java easymock-4.3/core/src/main/java/org/easymock/internal/LinkedClassLoader.java --- easymock-4.2/core/src/main/java/org/easymock/internal/LinkedClassLoader.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/LinkedClassLoader.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/And.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/And.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/And.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/And.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Any.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Any.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Any.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Any.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/ArrayEquals.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Captures.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Captures.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Captures.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Captures.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/CompareEqual.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Compare.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Compare.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Compare.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Compare.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/CompareTo.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/CompareTo.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/CompareTo.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/CompareTo.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Contains.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Contains.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Contains.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Contains.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/EndsWith.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/EndsWith.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/EndsWith.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/EndsWith.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Equals.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Equals.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Equals.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Equals.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/EqualsWithDelta.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Find.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Find.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Find.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Find.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/GreaterOrEqual.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/GreaterThan.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/InstanceOf.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/LessOrEqual.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/LessThan.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/LessThan.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/LessThan.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/LessThan.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Matches.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Matches.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Matches.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Matches.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Not.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Not.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Not.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Not.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/NotNull.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/NotNull.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/NotNull.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/NotNull.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Null.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Null.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Null.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Null.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Or.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Or.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Or.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Or.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Same.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Same.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/Same.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/Same.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/matchers/StartsWith.java easymock-4.3/core/src/main/java/org/easymock/internal/matchers/StartsWith.java --- easymock-4.2/core/src/main/java/org/easymock/internal/matchers/StartsWith.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/matchers/StartsWith.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java easymock-4.3/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java --- easymock-4.2/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/MethodSerializationWrapper.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/MockBuilder.java easymock-4.3/core/src/main/java/org/easymock/internal/MockBuilder.java --- easymock-4.2/core/src/main/java/org/easymock/internal/MockBuilder.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/MockBuilder.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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,7 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Set; +import java.util.function.Predicate; /** * Default implementation of IMockBuilder. @@ -41,7 +42,7 @@ */ public class MockBuilder implements IMockBuilder { - private static final ReflectionUtils.Predicate CAN_BE_MOCKED = method -> { + private static final Predicate CAN_BE_MOCKED = 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) { diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/MockInvocationHandler.java easymock-4.3/core/src/main/java/org/easymock/internal/MockInvocationHandler.java --- easymock-4.2/core/src/main/java/org/easymock/internal/MockInvocationHandler.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/MockInvocationHandler.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/MocksBehavior.java easymock-4.3/core/src/main/java/org/easymock/internal/MocksBehavior.java --- easymock-4.2/core/src/main/java/org/easymock/internal/MocksBehavior.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/MocksBehavior.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; /** * @author OFFIS, Tammo Freese @@ -42,15 +43,15 @@ private volatile boolean shouldBeUsedInOneThread; - private volatile int position = 0; + private final AtomicInteger position = new AtomicInteger(); private transient volatile Thread lastThread; public MocksBehavior(boolean nice) { this.nice = nice; - this.isThreadSafe = !Boolean.valueOf(EasyMockProperties.getInstance().getProperty( + this.isThreadSafe = !Boolean.parseBoolean(EasyMockProperties.getInstance().getProperty( EasyMock.NOT_THREAD_SAFE_BY_DEFAULT)); - this.shouldBeUsedInOneThread = Boolean.valueOf(EasyMockProperties.getInstance().getProperty( + this.shouldBeUsedInOneThread = Boolean.parseBoolean(EasyMockProperties.getInstance().getProperty( EasyMock.ENABLE_THREAD_SAFETY_CHECK_BY_DEFAULT)); } @@ -86,17 +87,18 @@ @Override public final Result addActual(Invocation actual) { - int initialPosition = position; + int initialPosition = position.get(); - while (position < behaviorLists.size()) { - Result result = behaviorLists.get(position).addActual(actual); + while (position.get() < behaviorLists.size()) { + int index = position.get(); + Result result = behaviorLists.get(index).addActual(actual); if (result != null) { return result; } - if (!behaviorLists.get(position).verify()) { + if (!behaviorLists.get(index).verify()) { break; } - position++; + position.incrementAndGet(); } Result stubOrNice = getStubResult(actual); if (stubOrNice == null && nice) { @@ -104,10 +106,10 @@ .getReturnType())); } - int endPosition = position; + int endPosition = position.get(); // Do not move the cursor in case of stub, nice or error - position = initialPosition; + position.set(initialPosition); if (stubOrNice != null) { actual.validateCaptures(); @@ -160,7 +162,7 @@ public void verifyRecording() { boolean verified = true; - for (UnorderedBehavior behaviorList : behaviorLists.subList(position, behaviorLists.size())) { + for (UnorderedBehavior behaviorList : behaviorLists.subList(position.get(), behaviorLists.size())) { if (!behaviorList.verify()) { verified = false; break; @@ -170,10 +172,10 @@ return; } - StringBuilder errorMessage = new StringBuilder(70 * (behaviorLists.size() - position + 1)); + StringBuilder errorMessage = new StringBuilder(70 * (behaviorLists.size() - position.get() + 1)); errorMessage.append("\n Expectation failure on verify:"); - for (UnorderedBehavior behaviorList : behaviorLists.subList(position, behaviorLists.size())) { + for (UnorderedBehavior behaviorList : behaviorLists.subList(position.get(), behaviorLists.size())) { for (ErrorMessage m : behaviorList.getMessages(null)) { m.appendTo(errorMessage, 0); } diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/MocksControl.java easymock-4.3/core/src/main/java/org/easymock/internal/MocksControl.java --- easymock-4.2/core/src/main/java/org/easymock/internal/MocksControl.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/MocksControl.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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,12 +15,19 @@ */ package org.easymock.internal; -import org.easymock.*; +import org.easymock.ConstructorArgs; +import org.easymock.EasyMock; +import org.easymock.IAnswer; +import org.easymock.IExpectationSetters; +import org.easymock.IMocksControl; +import org.easymock.MockType; import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.Set; /** * @author OFFIS, Tammo Freese @@ -84,8 +91,10 @@ if (toMock == null) { throw new NullPointerException("Can't mock 'null'"); } + // If we have mockedMethods, it means it's a partial mock. So it shouldn't be an interface that is mocked + // unless the interface has default methods and that it's some of these methods that are in mockedMethods if (toMock.isInterface() && mockedMethods != null) { - throw new IllegalArgumentException("Partial mocking doesn't make sense for interface"); + checkInterfaceHasDefaultMethodAndIsMockingOnlyThem(toMock, mockedMethods); } try { @@ -111,6 +120,17 @@ } } + private void checkInterfaceHasDefaultMethodAndIsMockingOnlyThem(Class toMock, Method[] mockedMethods) { + Set defaultMethods = ReflectionUtils.getDefaultMethods(toMock); + if(defaultMethods.isEmpty()) { + throw new IllegalArgumentException("Partial mocking doesn't make sense for interface (" + toMock + ") without default defaultMethods"); + } + if(!defaultMethods.containsAll(Arrays.asList(mockedMethods))) { + throw new IllegalArgumentException("Mocking non-default method (one of " + Arrays.toString(mockedMethods) + + ") of an interface (" + toMock + ") doesn't make sense."); + } + } + public static IProxyFactory getProxyFactory(Object o) { return Proxy.isProxyClass(o.getClass()) ? interfaceProxyFactory @@ -120,7 +140,7 @@ private static IProxyFactory getClassProxyFactory() { String classMockingDisabled = EasyMockProperties.getInstance().getProperty( EasyMock.DISABLE_CLASS_MOCKING); - if (Boolean.valueOf(classMockingDisabled)) { + if (Boolean.parseBoolean(classMockingDisabled)) { throw new IllegalArgumentException("Class mocking is currently disabled. Change " + EasyMock.DISABLE_CLASS_MOCKING + " to true do modify this behavior"); } diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java easymock-4.3/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ObjectMethodsFilter.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.util.function.Predicate; /** * @author OFFIS, Tammo Freese @@ -29,7 +30,7 @@ private static final long serialVersionUID = -1726286682930686024L; - private static final ReflectionUtils.Predicate NOT_PRIVATE = method -> !Modifier.isPrivate(method.getModifiers()); + private static final Predicate NOT_PRIVATE = method -> !Modifier.isPrivate(method.getModifiers()); private transient Method equalsMethod; @@ -57,9 +58,9 @@ } else { try { equalsMethod = extractMethod(toMock, "equals", Object.class); - hashCodeMethod = extractMethod(toMock, "hashCode", (Class[]) null); - toStringMethod = extractMethod(toMock, "toString", (Class[]) null); - finalizeMethod = ReflectionUtils.findMethod(toMock, "finalize", NOT_PRIVATE, (Class[]) null); + hashCodeMethod = extractMethod(toMock, "hashCode", (Class[]) null); + toStringMethod = extractMethod(toMock, "toString", (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-4.2/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java easymock-4.3/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ObjenesisClassInstantiator.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/PrimitiveUtils.java easymock-4.3/core/src/main/java/org/easymock/internal/PrimitiveUtils.java --- easymock-4.2/core/src/main/java/org/easymock/internal/PrimitiveUtils.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/PrimitiveUtils.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Range.java easymock-4.3/core/src/main/java/org/easymock/internal/Range.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Range.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Range.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ } public String expectedCount() { - return "expected: " + this.toString(); + return "expected: " + this; } public boolean contains(int count) { diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/RecordState.java easymock-4.3/core/src/main/java/org/easymock/internal/RecordState.java --- easymock-4.2/core/src/main/java/org/easymock/internal/RecordState.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/RecordState.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ReflectionUtils.java easymock-4.3/core/src/main/java/org/easymock/internal/ReflectionUtils.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ReflectionUtils.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ReflectionUtils.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,16 +21,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * @author Henri Tremblay */ public final class ReflectionUtils { - public interface Predicate { - boolean test(T t); - } - public static final Predicate NOT_PRIVATE = method -> !Modifier.isPrivate(method.getModifiers()); private static final Map, Class> primitiveToWrapperType = new HashMap<>(8); @@ -49,11 +48,11 @@ public static final Method OBJECT_EQUALS = getDeclaredMethod(Object.class, "equals", Object.class); - public static final Method OBJECT_HASHCODE = getDeclaredMethod(Object.class, "hashCode", (Class[]) null); + public static final Method OBJECT_HASHCODE = getDeclaredMethod(Object.class, "hashCode", (Class[]) null); - public static final Method OBJECT_TOSTRING = getDeclaredMethod(Object.class, "toString", (Class[]) null); + public static final Method OBJECT_TOSTRING = getDeclaredMethod(Object.class, "toString", (Class[]) null); - public static final Method OBJECT_FINALIZE = getDeclaredMethod(Object.class, "finalize", (Class[]) null); + public static final Method OBJECT_FINALIZE = getDeclaredMethod(Object.class, "finalize", (Class[]) null); // ///CLOVER:OFF private ReflectionUtils() { @@ -149,7 +148,7 @@ for(Class i : interfaces) { Method[] methods = i.getDeclaredMethods(); for (Method method : methods) { - if(!isDefaultMethod(method)) { + if(!method.isDefault()) { continue; } if (name.equals(method.getName())) { @@ -292,10 +291,18 @@ 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; + /** + * Return all default methods of an interface and it's inherited interface. + * + * @param clazz class for which we want the default method + * @return all default methods + */ + public static Set getDefaultMethods(Class clazz) { + if(!clazz.isInterface()) { + throw new IllegalArgumentException("Only interfaces can have default methods. Not " + clazz); + } + return Arrays.stream(clazz.getMethods()) + .filter(Method::isDefault) + .collect(Collectors.toSet()); } } diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ReplayState.java easymock-4.3/core/src/main/java/org/easymock/internal/ReplayState.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ReplayState.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ReplayState.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Result.java easymock-4.3/core/src/main/java/org/easymock/internal/Result.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Result.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Result.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ if(!method.isVarArgs()) { return arguments; } - Class[] paramTypes = method.getParameterTypes(); + Class[] paramTypes = method.getParameterTypes(); Object[] packedArguments = new Object[paramTypes.length]; int normalArgLength = paramTypes.length - 1; diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/Results.java easymock-4.3/core/src/main/java/org/easymock/internal/Results.java --- easymock-4.2/core/src/main/java/org/easymock/internal/Results.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/Results.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java easymock-4.3/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java --- easymock-4.2/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/RuntimeExceptionWrapper.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/ThrowableWrapper.java easymock-4.3/core/src/main/java/org/easymock/internal/ThrowableWrapper.java --- easymock-4.2/core/src/main/java/org/easymock/internal/ThrowableWrapper.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/ThrowableWrapper.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/internal/UnorderedBehavior.java easymock-4.3/core/src/main/java/org/easymock/internal/UnorderedBehavior.java --- easymock-4.2/core/src/main/java/org/easymock/internal/UnorderedBehavior.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/internal/UnorderedBehavior.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/LogicalOperator.java easymock-4.3/core/src/main/java/org/easymock/LogicalOperator.java --- easymock-4.2/core/src/main/java/org/easymock/LogicalOperator.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/LogicalOperator.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/mockito/OngoingStubbingBridge.java easymock-4.3/core/src/main/java/org/easymock/mockito/OngoingStubbingBridge.java --- easymock-4.2/core/src/main/java/org/easymock/mockito/OngoingStubbingBridge.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/mockito/OngoingStubbingBridge.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/* - * Copyright 2001-2020 the original author 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.mockito; - -import org.easymock.IExpectationSetters; - -public class OngoingStubbingBridge { - - private final IExpectationSetters expectationSetters; - - public OngoingStubbingBridge(IExpectationSetters expectationSetters) { - this.expectationSetters = expectationSetters; - } -} diff -Nru easymock-4.2/core/src/main/java/org/easymock/Mock.java easymock-4.3/core/src/main/java/org/easymock/Mock.java --- easymock-4.2/core/src/main/java/org/easymock/Mock.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/Mock.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/MockType.java easymock-4.3/core/src/main/java/org/easymock/MockType.java --- easymock-4.2/core/src/main/java/org/easymock/MockType.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/MockType.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/Preview.java easymock-4.3/core/src/main/java/org/easymock/Preview.java --- easymock-4.2/core/src/main/java/org/easymock/Preview.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/Preview.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/main/java/org/easymock/TestSubject.java easymock-4.3/core/src/main/java/org/easymock/TestSubject.java --- easymock-4.2/core/src/main/java/org/easymock/TestSubject.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/main/java/org/easymock/TestSubject.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRuleTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/AnnotatedMockWithRunnerTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/BasicClassMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/ClassTested.java easymock-4.3/core/src/samples/java/org/easymock/samples/ClassTested.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/ClassTested.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/ClassTested.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/Collaborator.java easymock-4.3/core/src/samples/java/org/easymock/samples/Collaborator.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/Collaborator.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/Collaborator.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/ConstructorCalledMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/EnclosedTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/EnclosedTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/EnclosedTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/EnclosedTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/ExampleTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/ExampleTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/ExampleTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/ExampleTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/PartialClassMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/SupportDelegationTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/SupportTest.java easymock-4.3/core/src/samples/java/org/easymock/samples/SupportTest.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/SupportTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/SupportTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/samples/java/org/easymock/samples/ThrowableEquals.java easymock-4.3/core/src/samples/java/org/easymock/samples/ThrowableEquals.java --- easymock-4.2/core/src/samples/java/org/easymock/samples/ThrowableEquals.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/samples/java/org/easymock/samples/ThrowableEquals.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/internal/InjectorTest.java easymock-4.3/core/src/test/java/org/easymock/internal/InjectorTest.java --- easymock-4.2/core/src/test/java/org/easymock/internal/InjectorTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/internal/InjectorTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java easymock-4.3/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java --- easymock-4.2/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/internal/LinkedClassLoaderTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java easymock-4.3/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java --- easymock-4.2/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/internal/PrimitiveUtilsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/internal/PrivateNoArgConstructor.java easymock-4.3/core/src/test/java/org/easymock/internal/PrivateNoArgConstructor.java --- easymock-4.2/core/src/test/java/org/easymock/internal/PrivateNoArgConstructor.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/internal/PrivateNoArgConstructor.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.easymock.internal; public class PrivateNoArgConstructor { diff -Nru easymock-4.2/core/src/test/java/org/easymock/internal/ThrowingNoArgConstructor.java easymock-4.3/core/src/test/java/org/easymock/internal/ThrowingNoArgConstructor.java --- easymock-4.2/core/src/test/java/org/easymock/internal/ThrowingNoArgConstructor.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/internal/ThrowingNoArgConstructor.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.easymock.internal; public class ThrowingNoArgConstructor { diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ArgumentToStringTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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,9 @@ import org.junit.Before; import org.junit.Test; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import static org.junit.Assert.*; /** @@ -80,4 +83,24 @@ String actual = ArgumentToString.argumentsToString((Object[]) null); assertEquals("", actual); } + + @Test + public void testArrayToLong_100elements() { + int[] array = IntStream.range(0, 100).toArray(); + String actual = ArgumentToString.argumentsToString((Object) array); + String expected = IntStream.range(0, 100) + .mapToObj(i -> i + " (int)") + .collect(Collectors.joining(", ", "[", "]")); + assertEquals(expected, actual); + } + + @Test + public void testArrayToLong_101elements() { + int[] array = IntStream.range(0, 101).toArray(); + String actual = ArgumentToString.argumentsToString((Object) array); + String expected = "[" + IntStream.range(0, 100) + .mapToObj(i -> i + " (int)") + .collect(Collectors.joining(", ")) + "... (length=101)]"; + assertEquals(expected, actual); + } } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java easymock-4.3/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/BaseEasyMockRunnerTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java easymock-4.3/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/CapturesMatcherTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/CglibTest.java easymock-4.3/core/src/test/java/org/easymock/tests/CglibTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/CglibTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/CglibTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ClassInstantiatorFactoryTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ConstructorTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ConstructorTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ConstructorTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ConstructorTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java easymock-4.3/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/DefaultClassInstantiatorTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ErrorMessageTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ErrorMessageTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ErrorMessageTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ErrorMessageTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ExpectedMethodCallTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/FinalEqualsTest.java easymock-4.3/core/src/test/java/org/easymock/tests/FinalEqualsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/FinalEqualsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/FinalEqualsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/GenericTest.java easymock-4.3/core/src/test/java/org/easymock/tests/GenericTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/GenericTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/GenericTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,9 +55,8 @@ */ @Test public void testPartialMockingSeesBridgeHasUnmocked() { - ConcreteFoo b = createMockBuilder(ConcreteFoo.class).addMockedMethod("getSomeStrings") + AbstractFoo c = createMockBuilder(ConcreteFoo.class).addMockedMethod("getSomeStrings") .createMock(); - AbstractFoo c = b; expect(c.getSomeStrings()).andReturn(null); } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/IMethods.java easymock-4.3/core/src/test/java/org/easymock/tests/IMethods.java --- easymock-4.2/core/src/test/java/org/easymock/tests/IMethods.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/IMethods.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/IMockBuilderTest.java easymock-4.3/core/src/test/java/org/easymock/tests/IMockBuilderTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/IMockBuilderTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/IMockBuilderTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/InvocationTest.java easymock-4.3/core/src/test/java/org/easymock/tests/InvocationTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/InvocationTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/InvocationTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/IVarArgs.java easymock-4.3/core/src/test/java/org/easymock/tests/IVarArgs.java --- easymock-4.2/core/src/test/java/org/easymock/tests/IVarArgs.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/IVarArgs.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/LimitationsTest.java easymock-4.3/core/src/test/java/org/easymock/tests/LimitationsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/LimitationsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/LimitationsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MatchableArgumentsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MethodSerializationWrapperTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MockClassControlTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MockClassControlTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MockClassControlTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MockClassControlTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MockingTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MockingTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MockingTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MockingTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MockNameTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MockNameTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MockNameTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MockNameTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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 public void defaultName() { IMethods mock = createMock(IMethods.class); - String expected = "EasyMock for " + IMethods.class.toString(); + String expected = "EasyMock for " + IMethods.class; String actual = mock.toString(); assertEquals(expected, actual); } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/MockTypeTest.java easymock-4.3/core/src/test/java/org/easymock/tests/MockTypeTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/MockTypeTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/MockTypeTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/NiceMockControlLongCompatibleReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/NiceMockControlTest.java easymock-4.3/core/src/test/java/org/easymock/tests/NiceMockControlTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/NiceMockControlTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/NiceMockControlTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ObjectMethodsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,13 +62,13 @@ @Test public void toStringBeforeActivation() { - assertEquals("EasyMock for " + EmptyInterface.class.toString(), mock.toString()); + assertEquals("EasyMock for " + EmptyInterface.class, mock.toString()); } @Test public void toStringAfterActivation() { replay(mock); - assertEquals("EasyMock for " + EmptyInterface.class.toString(), mock.toString()); + assertEquals("EasyMock for " + EmptyInterface.class, mock.toString()); } private static class MockedClass { @@ -83,7 +83,7 @@ public void toStringForClasses() throws Throwable { ObjectMethodsFilter filter = new ObjectMethodsFilter(Object.class, null, null); Method toString = Object.class.getMethod("toString"); - assertEquals("EasyMock for " + MockedClass.class.toString(), filter.invoke(new DummyProxy(), + assertEquals("EasyMock for " + MockedClass.class, filter.invoke(new DummyProxy(), toString, new Object[0])); } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidDefaultThrowableTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidRangeTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidStateChangeTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidThrowableTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateInvalidUsageTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/RecordStateMethodCallMissingTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ReplayStateInvalidCallsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ReplayStateInvalidUsageTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/ResultTest.java easymock-4.3/core/src/test/java/org/easymock/tests/ResultTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/ResultTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/ResultTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/StacktraceTest.java easymock-4.3/core/src/test/java/org/easymock/tests/StacktraceTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/StacktraceTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/StacktraceTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/TypingTest.java easymock-4.3/core/src/test/java/org/easymock/tests/TypingTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/TypingTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/TypingTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageCallCountTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageCallCountTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageCallCountTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageCallCountTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageDefaultReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultReturnTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndDefaultThrowTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndReturnTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageExpectAndThrowTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageFloatingPointReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageLongCompatibleReturnValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageOverloadedDefaultValueTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageOverloadedMethodTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageRangeTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageRangeTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageRangeTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageRangeTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageStrictMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageThrowableTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageThrowableTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageThrowableTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageThrowableTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageUnorderedTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageVarargTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageVarargTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageVarargTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageVarargTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UsageVerifyTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UsageVerifyTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UsageVerifyTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UsageVerifyTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/Util.java easymock-4.3/core/src/test/java/org/easymock/tests/Util.java --- easymock-4.2/core/src/test/java/org/easymock/tests/Util.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/Util.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests/UtilTest.java easymock-4.3/core/src/test/java/org/easymock/tests/UtilTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests/UtilTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests/UtilTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/AnswerTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/AnswerTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/AnswerTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/AnswerTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/AutoInstantiationTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/AutoInstantiationTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/AutoInstantiationTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/AutoInstantiationTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/CallbackAndArgumentsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/CallbackTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/CallbackTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/CallbackTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/CallbackTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/CaptureTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/CaptureTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/CaptureTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/CaptureTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ChildEquals.java easymock-4.3/core/src/test/java/org/easymock/tests2/ChildEquals.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ChildEquals.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ChildEquals.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/CompareToTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/CompareToTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/CompareToTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/CompareToTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ConstraintsToStringTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ConstructorArgsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/DelegateToTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/DelegateToTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/DelegateToTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/DelegateToTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockAnnotationsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockClassExtensionTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockRuleTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockRunnerTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/EasyMockSupportTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/MockBuilderTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/MockBuilderTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/MockBuilderTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/MockBuilderTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/MockedExceptionTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/MocksControlDefaultMethodsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/MocksControlDefaultMethodsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/MocksControlDefaultMethodsTest.java 1970-01-01 00:00:00.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/MocksControlDefaultMethodsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -0,0 +1,85 @@ +/* + * Copyright 2001-2021 the original author 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.tests2; + +import org.easymock.internal.ReflectionUtils; +import org.junit.Test; + +import java.lang.reflect.Method; +import java.util.function.Function; + +import static org.easymock.EasyMock.createControl; +import static org.junit.Assert.assertEquals; + +/** + * @author Henri Tremblay + */ +public class MocksControlDefaultMethodsTest { + + @Test + public void emptyInterface() { + expectPartialMocking("an empty interface", false, Cloneable.class); + } + + @Test + public void interfaceWithoutDefaultMethods() { + expectPartialMocking("an interface without default methods", false, Runnable.class); + } + + @Test + public void interfaceWithDefaultMethodButNoMockedMethods() { + expectPartialMocking("an interface with a default method", true, Function.class); + } + + @Test + public void interfaceWithDefaultMethodAndMockedMethods() { + expectPartialMocking("an interface with a default method and a mocked method", true, Function.class, + ReflectionUtils.findMethod(Function.class, "andThen", method -> true)); + } + + @Test + public void interfaceWithInheritedDefaultMethod() { + expectPartialMocking("an interface with an inherited default method", true, + InterfaceWithInheritedDefaultMethod.class); + } + + @Test + public void interfaceWithMockedMethodThatIsNotADefaultMethod() { + expectPartialMocking("an interface with a mocked method that is not a default method", false, + Function.class, ReflectionUtils.findMethod(Function.class, "apply", method -> true)); + } + + private void expectPartialMocking(String caseName, boolean expected, Class toMock, Method... mockedMethods) { + String allowanceText = "should" + (expected ? "" : "n't") + " be allowed"; + String message = "partial mocking on " + caseName + " " + allowanceText; + assertEquals(message, expected, tryMock(toMock, mockedMethods)); + } + + private boolean tryMock(Class toMock, Method... mockedMethods) { + try { + createControl().createMock(null, toMock, null, mockedMethods); + return true; + } catch (IllegalArgumentException e) { + return false; + } + } + + private interface InterfaceWithDefaultMethod { + default void method() {} + } + + private interface InterfaceWithInheritedDefaultMethod extends InterfaceWithDefaultMethod {} +} diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/MocksControlTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/MocksControlTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/MocksControlTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/MocksControlTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author 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,12 +19,11 @@ import org.easymock.IMocksControl; 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.*; +import static org.junit.Assert.assertEquals; /** * @author Henri Tremblay @@ -139,42 +138,11 @@ assertEquals("myMock", a.toString()); } - @Test - public void testInterfaceForbidden_PartialMock() throws Exception { - ConstructorArgs args = new ConstructorArgs(ArrayList.class.getConstructor(Integer.TYPE), 6); - Method[] methods = new Method[] { List.class.getMethod("size") }; - - IMocksControl ctrl = createControl(); - - try { - ctrl.createMock(null, List.class, null, methods); - fail("partial mocking on interface shouldn't be allowed"); - } catch (IllegalArgumentException e) { - } - - try { - ctrl.createMock(null, List.class, args, methods); - fail("partial mocking on interface shouldn't be allowed"); - } catch (IllegalArgumentException e) { - } - - try { - ctrl.createMock("myMock", List.class, null, methods); - fail("partial mocking on interface shouldn't be allowed"); - } catch (IllegalArgumentException e) { - } - - try { - ctrl.createMock("myMock", List.class, args, methods); - fail("partial mocking on interface shouldn't be allowed"); - } catch (IllegalArgumentException e) { - } - } - private void testList(IMocksControl ctrl, List list) { expect(list.size()).andReturn(3); ctrl.replay(); assertEquals(3, list.size()); ctrl.verify(); } + } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/NameTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/NameTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/NameTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/NameTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/NiceMockTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/NiceMockTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/NiceMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/NiceMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ParentEquals.java easymock-4.3/core/src/test/java/org/easymock/tests2/ParentEquals.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ParentEquals.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ParentEquals.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/PartialMockingTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/PartialMockingTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/PartialMockingTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/PartialMockingTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ReflectionUtilsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,9 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; +import java.util.Collection; +import java.util.List; +import java.util.function.Function; import static org.easymock.internal.ReflectionUtils.*; import static org.junit.Assert.*; @@ -29,7 +32,7 @@ */ public class ReflectionUtilsTest { - private static final Class[] NO_PARAMS = new Class[0]; + private static final Class[] NO_PARAMS = new Class[0]; public static class B { protected void foo(long l) { } @@ -171,4 +174,26 @@ assertEquals("parentMethod", method.getName()); assertEquals(B.class, method.getDeclaringClass()); } + + @Test + public void testGetDefaultMethods_onClass() { + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> ReflectionUtils.getDefaultMethods(getClass())); + assertEquals("Only interfaces can have default methods. Not " + getClass(), e.getMessage()); + } + + @Test + public void testGetDefaultMethods_noDefaultMethods() { + assertTrue(ReflectionUtils.getDefaultMethods(Runnable.class).isEmpty()); + } + + @Test + public void testGetDefaultMethods_withDefaultMethods() { + assertEquals(2, ReflectionUtils.getDefaultMethods(Function.class).size()); + } + + @Test + public void testGetDefaultMethods_withDefaultMethodsBaseClass() { + Method stream = findMethod(Collection.class, "stream", m -> true); + assertTrue(ReflectionUtils.getDefaultMethods(List.class).contains(stream)); + } } diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/SerializationTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/SerializationTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/SerializationTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/SerializationTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/StubTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/StubTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/StubTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/StubTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/ThreadingTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/ThreadingTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/ThreadingTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/ThreadingTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/UsageConstraintsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/UsageMatchersTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/UsageStrictMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/core/src/test/java/org/easymock/tests2/UsageTest.java easymock-4.3/core/src/test/java/org/easymock/tests2/UsageTest.java --- easymock-4.2/core/src/test/java/org/easymock/tests2/UsageTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/core/src/test/java/org/easymock/tests2/UsageTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/debian/changelog easymock-4.3/debian/changelog --- easymock-4.2/debian/changelog 2020-02-01 00:30:51.000000000 +0000 +++ easymock-4.3/debian/changelog 2021-08-20 21:58:15.000000000 +0000 @@ -1,3 +1,12 @@ +easymock (4.3-1) unstable; urgency=medium + + * New upstream version 4.3. + * Declare compliance with Debian Policy 4.6.0. + * Switch to debhelper-compat = 13. + * Ignore org.sonatype.plugins:nexus-staging-maven-plugin. + + -- Markus Koschany Fri, 20 Aug 2021 23:58:15 +0200 + easymock (4.2-1) unstable; urgency=medium * New upstream version 4.2 diff -Nru easymock-4.2/debian/control easymock-4.3/debian/control --- easymock-4.2/debian/control 2020-02-01 00:30:51.000000000 +0000 +++ easymock-4.3/debian/control 2021-08-20 21:58:15.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Markus Koschany Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk, junit4, junit5, @@ -16,7 +16,7 @@ libobjenesis-java, maven-debian-helper, testng -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Vcs-Git: https://salsa.debian.org/java-team/easymock.git Vcs-Browser: https://salsa.debian.org/java-team/easymock Homepage: http://www.easymock.org diff -Nru easymock-4.2/debian/copyright easymock-4.3/debian/copyright --- easymock-4.2/debian/copyright 2020-02-01 00:30:51.000000000 +0000 +++ easymock-4.3/debian/copyright 2021-08-20 21:58:15.000000000 +0000 @@ -8,7 +8,7 @@ .gitignore Files: * -Copyright: 2001-2020, OFFIS, Tammo Freese, Henri Tremblay +Copyright: 2001-2021, 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-2020, Markus Koschany + 2013-2021, Markus Koschany License: Apache-2.0 License: Apache-2.0 diff -Nru easymock-4.2/debian/maven.ignoreRules easymock-4.3/debian/maven.ignoreRules --- easymock-4.2/debian/maven.ignoreRules 2020-02-01 00:30:51.000000000 +0000 +++ easymock-4.3/debian/maven.ignoreRules 2021-08-20 21:58:15.000000000 +0000 @@ -35,3 +35,4 @@ org.droidparts.dexmaker dexmaker * * * * org.codehaus.mojo animal-sniffer-maven-plugin * * * * org.codehaus.mojo.signature java16 * * * * +org.sonatype.plugins nexus-staging-maven-plugin * * * * diff -Nru easymock-4.2/debian/patches/no-android.patch easymock-4.3/debian/patches/no-android.patch --- easymock-4.2/debian/patches/no-android.patch 2020-02-01 00:30:51.000000000 +0000 +++ easymock-4.3/debian/patches/no-android.patch 2021-08-20 21:58:15.000000000 +0000 @@ -1,5 +1,5 @@ From: Markus Koschany -Date: Sat, 1 Feb 2020 01:35:34 +0100 +Date: Fri, 20 Aug 2021 23:59:29 +0200 Subject: no-android Forwarded: not-needed @@ -11,12 +11,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 ae8712f..0000000 +index b4e4e01..0000000 --- a/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java +++ /dev/null @@ -1,101 +0,0 @@ -/* -- * Copyright 2001-2020 the original author or authors. +- * Copyright 2001-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. @@ -117,10 +117,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 710ab2e..520de3a 100644 +index ef83163..96c0741 100644 --- a/core/src/main/java/org/easymock/internal/MocksControl.java +++ b/core/src/main/java/org/easymock/internal/MocksControl.java -@@ -131,9 +131,9 @@ public class MocksControl implements IMocksControl, IExpectationSetters, +@@ -151,9 +151,9 @@ public class MocksControl implements IMocksControl, IExpectationSetters, } // ///CLOVER:OFF diff -Nru easymock-4.2/deploy-easymock.sh easymock-4.3/deploy-easymock.sh --- easymock-4.2/deploy-easymock.sh 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/deploy-easymock.sh 2021-04-18 00:55:38.000000000 +0000 @@ -2,8 +2,6 @@ # This script expects: # - gpg_passphrase to be an environment variable -# - bintray_user to be an environment variable -# - bintray_api_key to be an environment variable # to exit in case of error set -e @@ -41,8 +39,6 @@ # Get we have the environment variable we need message="should be an environment variable" [ -z "$gpg_passphrase" ] && echo "gpg_passphrase $message" && exit 1 -[ -z "$bintray_api_key" ] && echo "bintray_api_key $message" && exit 1 -[ -z "$bintray_user" ] && echo "bintray_user $message" && exit 1 # Seems to be required to make gpg happy export GPG_TTY=$(tty) @@ -80,6 +76,8 @@ echo "Deploy" mvn deploy -PfullBuild,deployBuild,all -DskipTests + +echo "Deployment done, please validate the staging repository https://oss.sonatype.org/#stagingRepositories" pause echo "Commit everything" @@ -111,31 +109,10 @@ open "https://github.com/easymock/easymock/releases" pause -# Login to bintray -echo "Please login on bintray" -open "https://bintray.com/easymock" -pause - -# Create the distribution in bintray -date=$(date "+%Y-%m-%d") -content="{ \"name\": \"$version\", \"desc\": \"$version\", \"released\": \"${date}T00:00:00.000Z\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"easymock-${version}\" }" -curl -H "Content-Type: application/json" -u$bintray_user:$bintray_api_key \ - -d "$content" https://api.bintray.com/packages/easymock/distributions/easymock/versions - -curl -v -H "X-GPG-PASSPHRASE: $gpg_passphrase" -u$bintray_user:$bintray_api_key -T "core/target/easymock-${version}-bundle.zip" https://api.bintray.com/content/easymock/distributions/easymock/${version}/easymock-${version}-bundle.zip?publish=1 - -echo "Flag the bundle as 'Show in download list' in bintray" -open "https://bintray.com/easymock/distributions/easymock/${version}#files" -pause - echo "Close the milestone in GitHub and create the new one" open "https://github.com/easymock/easymock/milestones" pause -echo "Sync to Maven central" -open "https://bintray.com/easymock/maven/easymock/${version}#central" -pause - echo "Update Javadoc" git rm -rf website/api cp -r core/target/apidocs website/api diff -Nru easymock-4.2/deploy-website.sh easymock-4.3/deploy-website.sh --- easymock-4.2/deploy-website.sh 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/deploy-website.sh 2021-04-18 00:55:38.000000000 +0000 @@ -11,7 +11,7 @@ # clone the website branch echo "************** CLONE ************************" -git clone --depth=1 --branch gh-pages git@github.com:easymock/easymock.git site +git clone --depth=1 --single-branch --branch gh-pages git@github.com:easymock/easymock.git site pushd site diff -Nru easymock-4.2/pom.xml easymock-4.3/pom.xml --- easymock-4.2/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -5,7 +5,7 @@ 4.0.0 org.easymock easymock-parent - 4.2 + 4.3 pom EasyMock Parent http://easymock.org @@ -28,7 +28,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -56,11 +56,12 @@ ISO-8859-1 1.8 - 0.8.5 - 3.1.12.2 - 4.0.0-RC1 - 5.6.0 - 3.0 + 0.8.6 + 4.2.2 + 4.2.2 + 5.7.1 + 4.0 + 3.1.2 @@ -79,7 +80,7 @@ junit junit - 4.13 + 4.13.2 org.junit.jupiter @@ -94,7 +95,7 @@ org.testng testng - 7.1.0 + 7.4.0 @@ -105,7 +106,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.2.0 com.mycila @@ -153,7 +154,7 @@ org.apache.felix maven-bundle-plugin - 4.1.0 + 5.1.2 maven-clean-plugin @@ -169,7 +170,7 @@ maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 maven-install-plugin @@ -177,32 +178,32 @@ maven-jar-plugin - 3.1.1 + 3.2.0 maven-javadoc-plugin - 3.1.0 + 3.2.0 maven-resources-plugin - 3.1.0 + 3.2.0 maven-site-plugin - 3.7.1 + 3.9.1 maven-source-plugin - 3.0.1 + 3.2.1 maven-surefire-plugin - 3.0.0-M4 + 3.0.0-M5 org.codehaus.mojo animal-sniffer-maven-plugin - 1.18 + 1.20 com.github.spotbugs @@ -242,7 +243,7 @@ maven-shade-plugin - 3.2.1 + 3.2.4 @@ -285,14 +286,14 @@ org.codehaus.mojo sonar-maven-plugin - 3.6.0.1398 + 3.8.0.2131 maven-remote-resources-plugin - 1.6.0 + 1.7.0 @@ -346,12 +347,12 @@ maven-checkstyle-plugin - 3.1.0 + ${maven-checkstyle-plugin.version} com.puppycrawl.tools checkstyle - 8.29 + 8.41.1 @@ -380,7 +381,7 @@ org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 com.mycila @@ -409,6 +410,20 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org + + false + + true + + @@ -423,7 +438,7 @@ maven-project-info-reports-plugin - 3.0.0 + 3.1.1 maven-javadoc-plugin @@ -449,11 +464,11 @@ maven-checkstyle-plugin - 3.1.0 + ${maven-checkstyle-plugin.version} maven-pmd-plugin - 3.12.0 + 3.14.0 1.8 @@ -478,10 +493,13 @@ - bintray - JFrog Bintray - https://api.bintray.com/maven/easymock/maven/easymock + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + @@ -539,7 +557,7 @@ attach-sources - jar + jar-no-fork diff -Nru easymock-4.2/README.md easymock-4.3/README.md --- easymock-4.2/README.md 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/README.md 2021-04-18 00:55:38.000000000 +0000 @@ -2,7 +2,7 @@ [![Join the chat at https://gitter.im/easymock/easymock](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/easymock/easymock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Download latest version](https://api.bintray.com/packages/easymock/distributions/easymock/images/download.svg) ](https://bintray.com/easymock/distributions/easymock/_latestVersion) +[![Download latest version](https://img.shields.io/github/downloads/easymock/easymock/total.svg)]() EasyMock is a Java library that provides an easy way to use Mock Objects in unit testing. @@ -17,12 +17,11 @@ ## Environment setup I'm using: -- IntelliJ 2019.3 Ultimate (thanks to JetBrains for the license) +- IntelliJ 2020.3 Ultimate (thanks to JetBrains for the license) - Maven 3.6.3 You can also use Eclipse. I tried -- Eclipse 4.5.0 (Mars) -- Say yes to all the plugins an m2 connectors to install +- Eclipse 2020.12 (but there was a weird compilation issue with ASM) To configure your local workspace: - Import the Maven parent project to Eclipse or IntelliJ @@ -61,26 +60,26 @@ ## To compile EasyMock in IntelliJ -- Import the EasyMock Maven parent project as an New IntelliJ project +- Import the EasyMock Maven parent project as a New IntelliJ project ## To update the versions - `mvn versions:set -DnewVersion=X.Y -Pall` - `mvn versions:commit -Pall` if everything is ok, `mvn versions:revert -Pall` otherwise -## Configure to deploy to the Bintray maven repository +## Configure to deploy to Maven Central repository - You will first need to add something like this to your settings.xml ```xml - - bintray - user - password - + + + ossrh + sonatypeuser + sonatypepassword + + ``` -- Then follow the instructions from the site below to create your key to sign the deployed items - -http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/ +- Then follow the [instructions](https://central.sonatype.org/pages/working-with-pgp-signatures.html) from the site below to create your key to sign the deployed items ## To build the maven site (with spotbugs, checkstyle, jdepends and JavaNCSS reports) @@ -119,16 +118,18 @@ - 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` +- Make sure `jq` is installed. If not, install it with your favorite package manager (`brew install jq`, `choco install jq`, `apt-get install jq`, `yum install jq`, etc.). - If gpg gives an `Inappropriate ioctl for device` error, enter this in your shell: `export GPG_TTY=$(tty)` - 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 +- Set the github_user, github_password, gpg_passphrase as environment variables - Launch ./deploy-easymock.sh version - During the deployment, you will be asked to do different things. Do them - Announce to gitter, tweet and blog ;-) In case of a failure during the build before the deployment, do `mvn versions:commit -Pall` and start over. +If something was staged in Maven Central, you can drop the staging repository with `mvn nexus-staging:drop`. + ## Deploy the website - In local: diff -Nru easymock-4.2/ReleaseNotes.md easymock-4.3/ReleaseNotes.md --- easymock-4.2/ReleaseNotes.md 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/ReleaseNotes.md 2021-04-18 00:55:38.000000000 +0000 @@ -1,6 +1,11 @@ -Add support to Java 15. TestSubject is now initialized when null by calling the no-arg constructor. +Add support to Java 16. You can now do a partial mock for default methods. Change log ---------- -* Support OpenJDK 15-EA and class version 59 ([#252](https://github.com/easymock/easymock/issues/252)) -* Try instantiating TestSubject automatically using its constructor without arguments ([#251](https://github.com/easymock/easymock/pull/251)) +* Update Objenesis to 3.2 ([#269](https://github.com/easymock/easymock/issues/269)) +* Easymock 4.2 fails with Java 16 (Unsupported class file major version 60) ([#268](https://github.com/easymock/easymock/issues/268)) +* Update asm to 9.1 ([#267](https://github.com/easymock/easymock/pull/267)) +* Allow partial mocking for interfaces with default methods ([#264](https://github.com/easymock/easymock/pull/264)) +* be more generic about jq install ([#257](https://github.com/easymock/easymock/pull/257)) +* Easymock throws java.lang.OutOfMemoryError: Java heap space trying to output large array (10MB+) ([#255](https://github.com/easymock/easymock/issues/255)) +* Serve easymock.org over HTTPS ([#220](https://github.com/easymock/easymock/issues/220)) diff -Nru easymock-4.2/.sdkmanrc easymock-4.3/.sdkmanrc --- easymock-4.2/.sdkmanrc 1970-01-01 00:00:00.000000000 +0000 +++ easymock-4.3/.sdkmanrc 2021-04-18 00:55:38.000000000 +0000 @@ -0,0 +1,3 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=8.0.282.hs-adpt diff -Nru easymock-4.2/test-android/pom.xml easymock-4.3/test-android/pom.xml --- easymock-4.2/test-android/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-android/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -4,7 +4,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-android-tck @@ -138,7 +138,7 @@ android-maven-plugin - 27 + 30 --min-sdk-version=26 @@ -148,7 +148,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.0.0 false @@ -200,6 +200,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-android/project.properties easymock-4.3/test-android/project.properties --- easymock-4.2/test-android/project.properties 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-android/project.properties 2021-04-18 00:55:38.000000000 +0000 @@ -1,2 +1,3 @@ # Project target. -target=android-26 +project.type=0 +target=android-30 diff -Nru easymock-4.2/test-android/src/main/AndroidManifest.xml easymock-4.3/test-android/src/main/AndroidManifest.xml --- easymock-4.2/test-android/src/main/AndroidManifest.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-android/src/main/AndroidManifest.xml 2021-04-18 00:55:38.000000000 +0000 @@ -30,7 +30,7 @@ + android:targetSdkVersion="30" /> diff -Nru easymock-4.2/test-android/src/main/java/org/easymock/android/AndroidTck.java easymock-4.3/test-android/src/main/java/org/easymock/android/AndroidTck.java --- easymock-4.2/test-android/src/main/java/org/easymock/android/AndroidTck.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-android/src/main/java/org/easymock/android/AndroidTck.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-deploy/pom.xml easymock-4.3/test-deploy/pom.xml --- easymock-4.2/test-deploy/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-deploy/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-deploy @@ -20,7 +20,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -59,7 +59,7 @@ maven-dependency-plugin - 3.1.1 + 3.1.2 @@ -115,6 +115,13 @@ license-maven-plugin ${license-maven-plugin.version} + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + @@ -145,9 +152,8 @@ false - bintray-easymock-maven - bintray - http://dl.bintray.com/easymock/maven + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2 diff -Nru easymock-4.2/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java easymock-4.3/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java --- easymock-4.2/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-deploy/src/test/java/org/easymock/test/EasyMockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-integration/pom.xml easymock-4.3/test-integration/pom.xml --- easymock-4.2/test-integration/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-integration/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-integration @@ -20,7 +20,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -30,7 +30,7 @@ true - 2.0.5 + 2.0.9 @@ -92,6 +92,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-integration/src/main/java/org/itests/StaticService.java easymock-4.3/test-integration/src/main/java/org/itests/StaticService.java --- easymock-4.2/test-integration/src/main/java/org/itests/StaticService.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-integration/src/main/java/org/itests/StaticService.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-integration/src/test/java/org/itests/PowermockTest.java easymock-4.3/test-integration/src/test/java/org/itests/PowermockTest.java --- easymock-4.2/test-integration/src/test/java/org/itests/PowermockTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-integration/src/test/java/org/itests/PowermockTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-java8/pom.xml easymock-4.3/test-java8/pom.xml --- easymock-4.2/test-java8/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-java8/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-java8 @@ -20,7 +20,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -75,6 +75,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-java8/src/test/java/org/easymock/java8/IMethods.java easymock-4.3/test-java8/src/test/java/org/easymock/java8/IMethods.java --- easymock-4.2/test-java8/src/test/java/org/easymock/java8/IMethods.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-java8/src/test/java/org/easymock/java8/IMethods.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-java8/src/test/java/org/easymock/java8/Java8Test.java easymock-4.3/test-java8/src/test/java/org/easymock/java8/Java8Test.java --- easymock-4.2/test-java8/src/test/java/org/easymock/java8/Java8Test.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-java8/src/test/java/org/easymock/java8/Java8Test.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,4 +52,16 @@ assertEquals(10, mock.normalInterfaceMethod()); verify(mock); } + + @Test + public void partialMockOnInterface() { + IMethods mock = partialMockBuilder(IMethods.class) + .addMockedMethod("defaultInterfaceMethod") + .createMock(); + expect(mock.defaultInterfaceMethod()).andReturn(10); + replay(mock); + assertEquals(10, mock.defaultInterfaceMethod()); + verify(mock); + } + } diff -Nru easymock-4.2/test-java8/src/test/java/org/easymock/java8/Methods.java easymock-4.3/test-java8/src/test/java/org/easymock/java8/Methods.java --- easymock-4.2/test-java8/src/test/java/org/easymock/java8/Methods.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-java8/src/test/java/org/easymock/java8/Methods.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java easymock-4.3/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java --- easymock-4.2/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-java8/src/test/java/org/easymock/java8/ReflectionUtilsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-junit5/pom.xml easymock-4.3/test-junit5/pom.xml --- easymock-4.2/test-junit5/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-junit5/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-junit5 @@ -20,7 +20,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -65,6 +65,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-junit5/src/test/java/org/test/EasymockExtensionTest.java easymock-4.3/test-junit5/src/test/java/org/test/EasymockExtensionTest.java --- easymock-4.2/test-junit5/src/test/java/org/test/EasymockExtensionTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-junit5/src/test/java/org/test/EasymockExtensionTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-nodeps/pom.xml easymock-4.3/test-nodeps/pom.xml --- easymock-4.2/test-nodeps/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-nodeps @@ -20,7 +20,7 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 @@ -75,6 +75,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-nodeps/src/test/java/org/depends/Dependency.java easymock-4.3/test-nodeps/src/test/java/org/depends/Dependency.java --- easymock-4.2/test-nodeps/src/test/java/org/depends/Dependency.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/src/test/java/org/depends/Dependency.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-nodeps/src/test/java/org/itests/DependencyTest.java easymock-4.3/test-nodeps/src/test/java/org/itests/DependencyTest.java --- easymock-4.2/test-nodeps/src/test/java/org/itests/DependencyTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/src/test/java/org/itests/DependencyTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-nodeps/src/test/java/org/itests/FilteringRule.java easymock-4.3/test-nodeps/src/test/java/org/itests/FilteringRule.java --- easymock-4.2/test-nodeps/src/test/java/org/itests/FilteringRule.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/src/test/java/org/itests/FilteringRule.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,8 +116,8 @@ out.flush(); - byte bytes[] = out.toByteArray(); - return bytes == null ? null : defineClass(name, bytes, 0, bytes.length); + byte[] bytes = out.toByteArray(); + return defineClass(name, bytes, 0, bytes.length); } finally { if (in != null) { in.close(); diff -Nru easymock-4.2/test-nodeps/src/test/java/org/itests/NoDepsTest.java easymock-4.3/test-nodeps/src/test/java/org/itests/NoDepsTest.java --- easymock-4.2/test-nodeps/src/test/java/org/itests/NoDepsTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/src/test/java/org/itests/NoDepsTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-nodeps/src/test/java/org/main/Main.java easymock-4.3/test-nodeps/src/test/java/org/main/Main.java --- easymock-4.2/test-nodeps/src/test/java/org/main/Main.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-nodeps/src/test/java/org/main/Main.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-osgi/pom.xml easymock-4.3/test-osgi/pom.xml --- easymock-4.2/test-osgi/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-osgi/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -7,7 +7,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-osgi @@ -20,13 +20,13 @@ henri Henri Tremblay - http://blog.tremblay.pro/ + https://blog.tremblay.pro -5 - 4.13.1 + 4.13.2 true @@ -91,7 +91,7 @@ org.apache.felix org.apache.felix.framework - 6.0.3 + 7.0.0 test @@ -146,6 +146,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java easymock-4.3/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java --- easymock-4.2/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-osgi/src/test/java/org/easymock/itests/InterfaceOnlyTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java easymock-4.3/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java --- easymock-4.2/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-osgi/src/test/java/org/easymock/itests/OsgiBaseTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java easymock-4.3/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java --- easymock-4.2/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-osgi/src/test/java/org/easymock/itests/OsgiTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-testng/pom.xml easymock-4.3/test-testng/pom.xml --- easymock-4.2/test-testng/pom.xml 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-testng/pom.xml 2021-04-18 00:55:38.000000000 +0000 @@ -5,7 +5,7 @@ org.easymock easymock-parent - 4.2 + 4.3 easymock-test-testng @@ -50,7 +50,7 @@ org.apache.maven.surefire surefire-testng - 3.0.0-M4 + 3.0.0-M5 @@ -65,6 +65,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + diff -Nru easymock-4.2/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java easymock-4.3/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java --- easymock-4.2/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-testng/src/test/java/org/easymock/itests/EasyMockListenerTest.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 the original author or authors. + * Copyright 2010-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-testng/src/test/java/org/easymock/itests/IMethods.java easymock-4.3/test-testng/src/test/java/org/easymock/itests/IMethods.java --- easymock-4.2/test-testng/src/test/java/org/easymock/itests/IMethods.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-testng/src/test/java/org/easymock/itests/IMethods.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 the original author or authors. + * Copyright 2010-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru easymock-4.2/test-testng/src/test/java/org/easymock/itests/IVarArgs.java easymock-4.3/test-testng/src/test/java/org/easymock/itests/IVarArgs.java --- easymock-4.2/test-testng/src/test/java/org/easymock/itests/IVarArgs.java 2020-01-29 03:38:41.000000000 +0000 +++ easymock-4.3/test-testng/src/test/java/org/easymock/itests/IVarArgs.java 2021-04-18 00:55:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 the original author or authors. + * Copyright 2010-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.