Repository: jclouds Updated Branches: refs/heads/master 31f528263 -> 9628a9064
Upgrade to EasyMock 3.4 Also switch from unmaintained easymockclassextension to easymock. Release notes: https://github.com/easymock/easymock/releases Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9628a906 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9628a906 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9628a906 Branch: refs/heads/master Commit: 9628a9064e31d43323eea9412b3944dbce75e0be Parents: 31f5282 Author: Andrew Gaul <[email protected]> Authored: Wed Sep 13 00:24:04 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sun Sep 17 15:45:46 2017 -0700 ---------------------------------------------------------------------- ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 32 ++++--- project/pom.xml | 6 +- ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 95 ++++++++++++-------- 3 files changed, 80 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/9628a906/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index 8e9f062..421cb8a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -20,12 +20,12 @@ import static com.google.common.io.BaseEncoding.base64; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.partialMockBuilder; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import javax.inject.Provider; -import java.lang.reflect.Method; import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; @@ -103,17 +103,20 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest { Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); EC2TemplateOptions options = createMock(EC2TemplateOptions.class); Template template = createMock(Template.class); @@ -160,17 +163,20 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest { Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); EC2TemplateOptions options = createMock(EC2TemplateOptions.class); Template template = createMock(Template.class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/9628a906/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index d1e202a..179e628 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -275,8 +275,8 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>3.1</version> + <artifactId>easymock</artifactId> + <version>3.4</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -384,7 +384,7 @@ </dependency> <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/jclouds/blob/9628a906/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index 3c738a6..fd49aa2 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -21,6 +21,7 @@ import static com.google.common.io.BaseEncoding.base64; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.partialMockBuilder; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions.Builder.keyPair; @@ -28,7 +29,6 @@ import static org.jclouds.ec2.compute.strategy.CreateKeyPairAndSecurityGroupsAsN import static org.jclouds.ec2.compute.strategy.CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.KEYPAIR; import static org.testng.Assert.assertEquals; -import java.lang.reflect.Method; import java.util.Set; import java.util.concurrent.ConcurrentMap; @@ -84,20 +84,24 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsT Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewPlacementGroupUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); AWSEC2TemplateOptions options = createMock(AWSEC2TemplateOptions.class); Template template = createMock(Template.class); @@ -147,20 +151,24 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsT Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewPlacementGroupUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); AWSEC2TemplateOptions options = createMock(AWSEC2TemplateOptions.class); Template template = createMock(Template.class); @@ -213,20 +221,24 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsT Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewPlacementGroupUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); AWSEC2TemplateOptions options = createMock(AWSEC2TemplateOptions.class); Template template = createMock(Template.class); @@ -277,22 +289,27 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsT String systemGeneratedKeyPairName = "systemGeneratedKeyPair"; // create mocks - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewPlacementGroupUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( - "vpcIdForSubnet", String.class)}); + "vpcIdForSubnet", String.class)) + .createMock(); AWSEC2TemplateOptions options = createMock(AWSEC2TemplateOptions.class); Template template = createMock(Template.class); @@ -342,20 +359,24 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptionsT Set<String> generatedGroups = ImmutableSet.of(generatedGroup); // create mocks - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = createMock( - CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class, - new Method[] { + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions strategy = partialMockBuilder( + CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class - .getDeclaredMethod("getOptionsProvider"), + .getDeclaredMethod("getOptionsProvider")) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewKeyPairUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "createNewPlacementGroupUnlessUserSpecifiedOtherwise", String.class, String.class, - TemplateOptions.class), + TemplateOptions.class)) + .addMockedMethod( CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.class.getDeclaredMethod( "getSecurityGroupsForTagAndOptions", String.class, String.class, String.class, - TemplateOptions.class) }); + TemplateOptions.class)) + .createMock(); AWSEC2TemplateOptions options = createMock(AWSEC2TemplateOptions.class); Template template = createMock(Template.class);
