brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/5] brooklyn-server git commit: Tidy test imports
Date Fri, 25 Mar 2016 00:44:27 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 3c051adc7 -> fafff2dad


Tidy test imports

Use com.google.common.collect instead of org.testng.collections

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

Branch: refs/heads/master
Commit: da26fb2a99b334dc8a9b8dc10d9bd960477c0c3e
Parents: ae57587
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri Mar 25 00:26:30 2016 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri Mar 25 00:26:30 2016 +0000

----------------------------------------------------------------------
 .../apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java |  2 +-
 .../brooklyn/core/entity/hello/LocalEntitiesTest.java   |  3 +--
 .../apache/brooklyn/core/test/entity/TestEntity.java    | 12 ++++++------
 .../util/core/task/CompoundTaskExecutionTest.java       |  2 +-
 .../jclouds/provider/AbstractJcloudsLocationTest.java   |  2 +-
 .../java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java  |  2 +-
 .../org/apache/brooklyn/feed/jmx/JmxHelperTest.java     |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
index 337c302..70c60ad 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
@@ -68,7 +68,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Suppliers;
@@ -76,6 +75,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 
 @Test
 public class EntitiesYamlTest extends AbstractYamlTest {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
index 320d7a3..9729068 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
@@ -39,7 +39,6 @@ import org.apache.brooklyn.api.mgmt.EntityManager;
 import org.apache.brooklyn.api.mgmt.Task;
 import org.apache.brooklyn.api.sensor.SensorEvent;
 import org.apache.brooklyn.api.sensor.SensorEventListener;
-import org.apache.brooklyn.core.entity.Entities;
 import org.apache.brooklyn.core.entity.EntityInternal;
 import org.apache.brooklyn.core.location.SimulatedLocation;
 import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
@@ -47,7 +46,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.time.Time;
@@ -58,6 +56,7 @@ import com.google.common.base.Stopwatch;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 
 /** tests effector invocation and a variety of sensor accessors and subscribers */
 public class LocalEntitiesTest extends BrooklynAppUnitTestSupport {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
index be8ad3d..733b912 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
@@ -43,11 +43,11 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
 import org.apache.brooklyn.core.entity.trait.Startable;
 import org.apache.brooklyn.core.sensor.BasicNotificationSensor;
 import org.apache.brooklyn.core.sensor.Sensors;
-import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.core.flags.SetFromFlag;
-import org.testng.collections.Lists;
-import org.testng.internal.annotations.Sets;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.TypeToken;
 
 /**
@@ -59,9 +59,9 @@ public interface TestEntity extends Entity, Startable, EntityLocal, EntityIntern
 
     @SetFromFlag("confName")
     public static final ConfigKey<String> CONF_NAME = ConfigKeys.newStringConfigKey("test.confName",
"Configuration key, my name", "defaultval");
-    public static final BasicConfigKey<Map> CONF_MAP_PLAIN = new BasicConfigKey<Map>(Map.class,
"test.confMapPlain", "Configuration key that's a plain map", MutableMap.of());
-    public static final BasicConfigKey<List> CONF_LIST_PLAIN = new BasicConfigKey<List>(List.class,
"test.confListPlain", "Configuration key that's a plain list", Lists.newArrayList());
-    public static final BasicConfigKey<Set> CONF_SET_PLAIN = new BasicConfigKey<Set>(Set.class,
"test.confSetPlain", "Configuration key that's a plain set", Sets.newHashSet());
+    public static final BasicConfigKey<Map> CONF_MAP_PLAIN = new BasicConfigKey<Map>(Map.class,
"test.confMapPlain", "Configuration key that's a plain map", ImmutableMap.of());
+    public static final BasicConfigKey<List> CONF_LIST_PLAIN = new BasicConfigKey<List>(List.class,
"test.confListPlain", "Configuration key that's a plain list", ImmutableList.of());
+    public static final BasicConfigKey<Set> CONF_SET_PLAIN = new BasicConfigKey<Set>(Set.class,
"test.confSetPlain", "Configuration key that's a plain set", ImmutableSet.of());
     public static final MapConfigKey<String> CONF_MAP_THING = new MapConfigKey<String>(String.class,
"test.confMapThing", "Configuration key that's a map thing");
     public static final MapConfigKey<Object> CONF_MAP_THING_OBJECT = new MapConfigKey<Object>(Object.class,
"test.confMapThing.obj", "Configuration key that's a map thing with objects");
     public static final ListConfigKey<String> CONF_LIST_THING = new ListConfigKey<String>(String.class,
"test.confListThing", "Configuration key that's a list thing");

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/core/src/test/java/org/apache/brooklyn/util/core/task/CompoundTaskExecutionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/CompoundTaskExecutionTest.java
b/core/src/test/java/org/apache/brooklyn/util/core/task/CompoundTaskExecutionTest.java
index 786277c..97444ba 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/task/CompoundTaskExecutionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/task/CompoundTaskExecutionTest.java
@@ -43,11 +43,11 @@ import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 
 /**
  * Test the operation of the {@link CompoundTask} class.

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
index 3bec46b..ab0a23e 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java
@@ -39,10 +39,10 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 public abstract class AbstractJcloudsLocationTest {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
index 424a927..517ff72 100644
--- a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
@@ -71,11 +71,11 @@ import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 
 /**
  * Test the operation of the {@link JmxFeed} class.

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxHelperTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxHelperTest.java b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxHelperTest.java
index e818835..0aa528c 100644
--- a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxHelperTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxHelperTest.java
@@ -44,11 +44,11 @@ import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 
 public class JmxHelperTest {
 


Mime
View raw message