Fixed invalid tests Core tests pass
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f4487047 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f4487047 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f4487047 Branch: refs/heads/two-dot-o Commit: f448704775c00977c2930270425b66472d7b3cf1 Parents: 8af1110 Author: Todd Nine <[email protected]> Authored: Wed Nov 12 14:28:47 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Wed Nov 12 14:28:47 2014 -0700 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 2 + .../usergrid/corepersistence/CpWalker.java | 9 +--- .../usergrid/persistence/CollectionIT.java | 3 +- .../persistence/EntityConnectionsIT.java | 43 ++++++++------------ .../PerformanceEntityRebuildIndexTest.java | 2 +- 5 files changed, 22 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f4487047/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java index af9dfe4..9943842 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java @@ -1341,6 +1341,8 @@ public class CpRelationManager implements RelationManager { Results raw = null; + Preconditions.checkNotNull( connectionType, "connectionType cannot be null" ); + Query query = new Query(); query.setConnectionType( connectionType ); query.setEntityType( connectedEntityType ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f4487047/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java index c3a9fe6..ff631ed 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java @@ -87,14 +87,7 @@ public class CpWalker { @Override public Observable<Edge> call( final String edgeType ) { - logger.debug( "Loading edges of edgeType {} from {}:{}\n scope {}:{}", - new Object[] { - edgeType, - applicationId.getType(), - applicationId.getUuid(), - applicationScope.getApplication().getType(), - applicationScope.getApplication().getUuid() - } ); + logger.debug( "Loading edges of type {} from node {}", edgeType, applicationId ); return gm.loadEdgesFromSource( new SimpleSearchByEdgeType( applicationId, http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f4487047/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java index a93c343..a201d85 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java @@ -52,7 +52,8 @@ import static org.junit.Assert.fail; //@RunWith(JukitoRunner.class) //@UseModules({ GuiceModule.class }) @Concurrent() -public class CollectionIT extends AbstractCoreIT { +public class + CollectionIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( CollectionIT.class ); @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f4487047/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java index 9c5ca8f..4b80e8b 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java @@ -49,10 +49,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { @Test public void testEntityConnectionsSimple() throws Exception { - UUID applicationId = setup.createApplication( "EntityConnectionsIT", "testEntityConnectionsSimple" ); - assertNotNull( applicationId ); - - EntityManager em = setup.getEmf().getEntityManager( applicationId ); + EntityManager em = app.getEntityManager(); assertNotNull( em ); User first = new User(); @@ -88,12 +85,8 @@ public class EntityConnectionsIT extends AbstractCoreIT { @Test public void testEntityConnections() throws Exception { - LOG.info( "\n\nEntityConnectionsIT.testEntityConnections\n" ); - - UUID applicationId = setup.createApplication( "EntityConnectionsIT", "testEntityConnections" ); - assertNotNull( applicationId ); - - EntityManager em = setup.getEmf().getEntityManager( applicationId ); + EntityManager em = app.getEntityManager(); + final UUID applicationId = app.getId(); assertNotNull( em ); LOG.info( "\n\nCreating Cat entity A with name of Dylan\n" ); @@ -149,13 +142,13 @@ public class EntityConnectionsIT extends AbstractCoreIT { LOG.info( "Find all connections for cat A: " + catA.getUuid() ); - testEntityConnections( applicationId, catA.getUuid(), "cat", 1 ); + testEntityConnections( applicationId, catA.getUuid(), "likes", "cat", 1 ); // List forward connections for award A LOG.info( "Find all connections for award A: " + awardA.getUuid() ); - testEntityConnections( applicationId, awardA.getUuid(), "award", 1 ); + testEntityConnections( applicationId, awardA.getUuid(),"awarded", "award", 1 ); // Establish connection from award A to cat A @@ -165,12 +158,12 @@ public class EntityConnectionsIT extends AbstractCoreIT { em.refreshIndex(); // List forward connections for cat A - - testEntityConnections( applicationId, catA.getUuid(), "cat", 1 ); - - // List forward connections for award A - - testEntityConnections( applicationId, awardA.getUuid(), "award", 2 ); +// Not valid with current usages +// testEntityConnections( applicationId, catA.getUuid(), "cat", 1 ); +// +// // List forward connections for award A +// +// testEntityConnections( applicationId, awardA.getUuid(), "award", 2 ); // List all cats in application's cats collection @@ -185,7 +178,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { public Map<String, Map<String, List<UUID>>> testEntityConnections( - UUID applicationId, UUID entityId, String entityType, int expectedCount ) throws Exception { + UUID applicationId, UUID entityId, String connectionType, String entityType, int expectedCount ) throws Exception { LOG.info( "----------------------------------------------------" ); LOG.info( "Checking connections for " + entityId.toString() ); @@ -193,7 +186,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { EntityManager em = setup.getEmf().getEntityManager( applicationId ); Entity en = em.get( new SimpleEntityRef( entityType, entityId)); - Results results = em.getConnectedEntities( en, null, null, Level.REFS ); + Results results = em.getConnectedEntities( en, connectionType, null, Level.REFS ); LOG.info( "----------------------------------------------------" ); assertEquals( "Expected " + expectedCount + " connections", @@ -235,10 +228,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { @Test public void testEntityConnectionsMembership() throws Exception { - UUID applicationId = setup.createApplication( "entityConnectionsTest", "testEntityConnectionsMembership" ); - assertNotNull( applicationId ); - - EntityManager em = setup.getEmf().getEntityManager( applicationId ); + EntityManager em = app.getEntityManager(); assertNotNull( em ); User first = new User(); @@ -306,11 +296,10 @@ public class EntityConnectionsIT extends AbstractCoreIT { @Test public void testGetConnectingEntities() throws Exception { - UUID applicationId = setup.createApplication( - "EntityConnectionsIT", "testGetConnectingEntities" ); + UUID applicationId = app.getId( ); assertNotNull( applicationId ); - EntityManager em = setup.getEmf().getEntityManager( applicationId ); + EntityManager em = app.getEm(); assertNotNull( em ); User fred = new User(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f4487047/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java index 174976d..16272af 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java @@ -257,7 +257,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT { assertEquals( 2000, e.getProperty("key2")); - Results catResults = em.searchConnectedEntities(e, Query.fromQL("select *")); + Results catResults = em.searchConnectedEntities(e, Query.fromQL("select *").setConnectionType( "herds" )); assertEquals( 3, catResults.size() ); if ( count % 100 == 0 ) {
