Core tests passing
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b6134986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b6134986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b6134986 Branch: refs/heads/USERGRID-273 Commit: b6134986567c941fc074f608a5d6aa539e5a125b Parents: 79f6bb6 Author: Todd Nine <tn...@apigee.com> Authored: Thu Jan 22 18:12:55 2015 -0700 Committer: Todd Nine <tn...@apigee.com> Committed: Thu Jan 22 18:12:55 2015 -0700 ---------------------------------------------------------------------- .../zookeeper/ZookeeperLockManagerTest.java | 3 ++ .../cassandra/EntityManagerFactoryImplIT.java | 17 +++----- .../persistence/query/IteratingQueryIT.java | 16 +++---- .../system/UsergridSystemMonitorIT.java | 6 +-- stack/pom.xml | 46 ++++++++++---------- 5 files changed, 42 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6134986/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java b/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java index e12a91b..c74f6f8 100644 --- a/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java @@ -37,10 +37,13 @@ import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.locking.exception.UGLockException; +import net.jcip.annotations.NotThreadSafe; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@NotThreadSafe public class ZookeeperLockManagerTest extends AbstractZooKeeperTest { private static final Logger logger = LoggerFactory.getLogger( ZookeeperLockManagerTest.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6134986/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java index 306ac35..e953fd2 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java @@ -44,6 +44,7 @@ import org.apache.usergrid.persistence.cassandra.util.TraceTag; import org.apache.usergrid.persistence.cassandra.util.TraceTagManager; import org.apache.usergrid.persistence.cassandra.util.TraceTagReporter; import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; +import org.apache.usergrid.setup.ConcurrentProcessSingleton; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -60,15 +61,9 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT { private static final Logger logger = LoggerFactory.getLogger( EntityManagerFactoryImplIT.class ); - @ClassRule - public static SpringResource springResource = SpringResource.getInstance(); - - @ClassRule - public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource(); - public EntityManagerFactoryImplIT() { - emf = springResource.getBean( EntityManagerFactory.class ); + emf = ConcurrentProcessSingleton.getInstance().getSpringResource().getBean( EntityManagerFactory.class ); } @@ -99,10 +94,10 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT { @Before public void initTracing() { - traceTagManager = springResource.getBean( - "traceTagManager", TraceTagManager.class ); - traceTagReporter = springResource.getBean( - "traceTagReporter", TraceTagReporter.class ); + traceTagManager = ConcurrentProcessSingleton.getInstance().getSpringResource().getBean( "traceTagManager", + TraceTagManager.class ); + traceTagReporter = ConcurrentProcessSingleton.getInstance().getSpringResource().getBean( "traceTagReporter", + TraceTagReporter.class ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6134986/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java index a6930a0..f602a53 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java @@ -407,7 +407,7 @@ public class IteratingQueryIT { protected void singleOrderByComplexIntersection( IoHelper io ) throws Exception { - int size = 2000; + int size = 200; int queryLimit = Query.MAX_LIMIT; // the number of entities that should be written including an intersection @@ -731,7 +731,7 @@ public class IteratingQueryIT { int size = 200; int queryLimit = 100; - int startValue = 400; + int startValue = 100; long start = System.currentTimeMillis(); @@ -792,8 +792,8 @@ public class IteratingQueryIT { io.doSetup(); int size = 200; - int queryLimit = 100; - int startValue = 400; + int queryLimit = 50; + int startValue = 100; long start = System.currentTimeMillis(); @@ -977,8 +977,8 @@ public class IteratingQueryIT { int size = 200; int queryLimit = 100; - int startValue = 100; - int endValue = 400; + int startValue = 50; + int endValue = 150; long start = System.currentTimeMillis(); @@ -1040,8 +1040,8 @@ public class IteratingQueryIT { int size = 200; int queryLimit = 100; - int startValue = 100; - int endValue = 400; + int startValue = 50; + int endValue = 150; long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6134986/stack/core/src/test/java/org/apache/usergrid/system/UsergridSystemMonitorIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/system/UsergridSystemMonitorIT.java b/stack/core/src/test/java/org/apache/usergrid/system/UsergridSystemMonitorIT.java index 9ca0e0c..cc9f79d 100644 --- a/stack/core/src/test/java/org/apache/usergrid/system/UsergridSystemMonitorIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/system/UsergridSystemMonitorIT.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.apache.commons.lang.StringUtils; import org.apache.usergrid.cassandra.SpringResource; +import org.apache.usergrid.setup.ConcurrentProcessSingleton; import org.apache.usergrid.utils.MapUtils; import static org.junit.Assert.assertEquals; @@ -35,15 +36,12 @@ import static org.junit.Assert.assertTrue; /** @author zznate */ public class UsergridSystemMonitorIT { - @ClassRule - public static SpringResource springResource = SpringResource.getInstance(); - private UsergridSystemMonitor usergridSystemMonitor; @Before public void setupLocal() { - usergridSystemMonitor = springResource.getBean( UsergridSystemMonitor.class ); + usergridSystemMonitor = ConcurrentProcessSingleton.getInstance().getSpringResource().getBean( UsergridSystemMonitor.class ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6134986/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index bb1afde..b48104d 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -1457,7 +1457,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>2.1</version> + <version>2.5</version> </plugin> <!-- @@ -1482,37 +1482,37 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> + <version>1.8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> + <version>2.5.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.6</version> + <version>2.11</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.10</version> + <version>2.13</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <version>2.6.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.2</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -1528,13 +1528,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <version>2.9</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <version>2.8.2</version> <inherited>true</inherited> </plugin> @@ -1547,7 +1547,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.6</version> + <version>2.10</version> </plugin> <plugin> @@ -1564,7 +1564,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ejb-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> </plugin> <plugin> @@ -1576,19 +1576,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.4</version> + <version>1.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> + <version>2.5.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>2.5</version> <executions> <execution> <id>test-jar-execution</id> @@ -1605,43 +1605,43 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> + <version>2.10.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>2.9</version> + <version>3.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>2.6</version> + <version>3.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>2.8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.4.1</version> + <version>2.5.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.2.1</version> + <version>1.5</version> </plugin> <plugin> @@ -1683,13 +1683,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.18</version> + <version>2.18.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.18</version> + <version>2.18.1</version> <configuration> <parallel>${usergrid.it.parallel}</parallel> <forkCount>${usergrid.it.forkCount}</forkCount>
