brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [35/50] brooklyn-server git commit: Changed AwsEc2LocationLiveTest to Java and fixed image pattern
Date Mon, 01 Feb 2016 17:49:39 GMT
Changed AwsEc2LocationLiveTest to Java and fixed image pattern


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/26cef980
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/26cef980
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/26cef980

Branch: refs/heads/0.6.0
Commit: 26cef980e4b2d01a7d9d8f3149b7482389cf97e6
Parents: dfe4c0f
Author: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Authored: Thu Nov 14 15:01:47 2013 +0000
Committer: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Committed: Thu Nov 14 15:01:47 2013 +0000

----------------------------------------------------------------------
 .../jclouds/AwsEc2LocationLiveTest.groovy       | 46 -------------------
 .../jclouds/AwsEc2LocationLiveTest.java         | 48 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/26cef980/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.groovy
b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.groovy
deleted file mode 100644
index 2205825..0000000
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-package brooklyn.location.jclouds
-
-import static org.testng.Assert.*
-
-import org.testng.annotations.DataProvider
-import org.testng.annotations.Test
-
-class AwsEc2LocationLiveTest extends AbstractJcloudsLocationTest {
-
-    private static final String PROVIDER = "aws-ec2"
-    private static final String EUWEST_REGION_NAME = "eu-west-1"
-    private static final String USEAST_REGION_NAME = "us-east-1"
-    private static final String EUWEST_IMAGE_ID = EUWEST_REGION_NAME+"/"+"ami-89def4fd"
-    private static final String USEAST_IMAGE_ID = USEAST_REGION_NAME+"/"+"ami-2342a94a"
-    private static final String IMAGE_OWNER = "411009282317"
-    private static final String IMAGE_PATTERN = ".*RightImage_CentOS_5.4_i386_v5.5.9_EBS.*"
-
-    public AwsEc2LocationLiveTest() {
-        super(PROVIDER)
-    }
-
-    @Override
-    @DataProvider(name = "fromImageId")
-    public Object[][] cloudAndImageIds() {
-        return [
-            [ EUWEST_REGION_NAME, EUWEST_IMAGE_ID, IMAGE_OWNER ],
-            [ USEAST_REGION_NAME, USEAST_IMAGE_ID, IMAGE_OWNER] ]
-    }
-
-    @Override
-    @DataProvider(name = "fromImageDescriptionPattern")
-    public Object[][] cloudAndImageDescriptionPatterns() {
-        return [
-            [ USEAST_REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER ],
-            [ USEAST_REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER] ]
-    }
-
-    @Override
-    @DataProvider(name = "fromImageNamePattern")
-    public Object[][] cloudAndImageNamePatterns() {
-        return []
-    }
-
-    @Test(enabled = false)
-    public void noop() { } /* just exists to let testNG IDE run the test */
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/26cef980/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.java
b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.java
new file mode 100644
index 0000000..f28dee5
--- /dev/null
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AwsEc2LocationLiveTest.java
@@ -0,0 +1,48 @@
+package brooklyn.location.jclouds;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class AwsEc2LocationLiveTest extends AbstractJcloudsLocationTest {
+
+    private static final String PROVIDER = "aws-ec2";
+    private static final String EUWEST_REGION_NAME = "eu-west-1";
+    private static final String USEAST_REGION_NAME = "us-east-1";
+    private static final String EUWEST_IMAGE_ID = EUWEST_REGION_NAME+"/"+"ami-89def4fd";
+    private static final String USEAST_IMAGE_ID = USEAST_REGION_NAME+"/"+"ami-2342a94a";
+    private static final String IMAGE_OWNER = "411009282317";
+    private static final String IMAGE_PATTERN = "RightImage_CentOS_5.4_i386_v5.5.9_EBS";
+
+    public AwsEc2LocationLiveTest() {
+        super(PROVIDER);
+    }
+
+    @Override
+    @DataProvider(name = "fromImageId")
+    public Object[][] cloudAndImageIds() {
+        return new Object[][] {
+                new Object[] { EUWEST_REGION_NAME, EUWEST_IMAGE_ID, IMAGE_OWNER },
+                new Object[] { USEAST_REGION_NAME, USEAST_IMAGE_ID, IMAGE_OWNER }
+            };
+    }
+
+    @Override
+    @DataProvider(name = "fromImageDescriptionPattern")
+    public Object[][] cloudAndImageDescriptionPatterns() {
+        return new Object[][] {
+                new Object[] { EUWEST_REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER },
+                new Object[] { USEAST_REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER }
+            };
+    }
+
+    @Override
+    @DataProvider(name = "fromImageNamePattern")
+    public Object[][] cloudAndImageNamePatterns() {
+        return new Object[][] {
+                new Object[] { USEAST_REGION_NAME, IMAGE_PATTERN, IMAGE_OWNER }
+            };
+    }
+
+    @Test(enabled = false)
+    public void noop() { } /* just exists to let testNG IDE run the test */
+}


Mime
View raw message