fix service tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c22f30a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c22f30a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c22f30a7 Branch: refs/heads/USERGRID-614 Commit: c22f30a75b9c216dfa43cc84b549b24bd7d05912 Parents: f02a1e4 Author: Shawn Feldman <[email protected]> Authored: Thu May 7 14:18:34 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Thu May 7 14:18:34 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/index/IndexServiceTest.java | 23 ++++++++++---------- .../persistence/index/impl/IndexingUtils.java | 4 +--- 2 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c22f30a7/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java index 8ba4397..5570df1 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexServiceTest.java @@ -177,7 +177,7 @@ public class IndexServiceTest { //query until it's available final CandidateResults collectionResults = getResults( applicationEntityIndex, collectionSearchEdge, - SearchTypes.fromTypes( testEntity.getId().getType() ), "select *", 100, 1, 100 ); + SearchTypes.fromTypes( testEntity.getId().getType() ), 1); assertEquals( 1, collectionResults.size() ); @@ -189,7 +189,7 @@ public class IndexServiceTest { //query until it's available final CandidateResults connectionResults = getResults( applicationEntityIndex, connectionSearchEdge, - SearchTypes.fromTypes( testEntity.getId().getType() ), "select *", 100, 1, 100 ); + SearchTypes.fromTypes( testEntity.getId().getType() ), 1 ); assertEquals( 1, connectionResults.size() ); @@ -232,14 +232,14 @@ public class IndexServiceTest { */ // final int edgeCount = indexFig.getIndexBatchSize()*2; - final int edgeCount = 2; + final int edgeCount = 100; final List<Edge> connectionSearchEdges = Observable.range( 0, edgeCount ).flatMap( integer -> { final Id connectingId = createId( "connecting" ); final Edge edge = CpNamingUtils.createConnectionEdge( connectingId, "likes", testEntity.getId() ); return graphManager.writeEdge( edge ).subscribeOn( Schedulers.io() ); - }, 20).toList().toBlocking().last(); + }).toList().toBlocking().last(); assertEquals( "All edges saved", edgeCount, connectionSearchEdges.size() ); @@ -266,7 +266,7 @@ public class IndexServiceTest { //query until it's available final CandidateResults collectionResults = getResults( applicationEntityIndex, collectionSearchEdge, - SearchTypes.fromTypes( testEntity.getId().getType() ), "select *", 100, 1, 100 ); + SearchTypes.fromTypes( testEntity.getId().getType() ), 1 ); assertEquals( 1, collectionResults.size() ); @@ -278,7 +278,7 @@ public class IndexServiceTest { //query until it's available final CandidateResults connectionResults = getResults( applicationEntityIndex, connectionSearchEdge, - SearchTypes.fromTypes( testEntity.getId().getType() ), "select *", 100, 1, 100 ); + SearchTypes.fromTypes( testEntity.getId().getType() ), 1 ); assertEquals( 1, connectionResults.size() ); @@ -290,7 +290,7 @@ public class IndexServiceTest { //query until it's available final CandidateResults lastConnectionResults = getResults( applicationEntityIndex, lastConnectionSearchEdge, - SearchTypes.fromTypes( testEntity.getId().getType() ), "select *", 100, 1, 100 ); + SearchTypes.fromTypes( testEntity.getId().getType() ), 1 ); assertEquals( 1, lastConnectionResults.size() ); @@ -299,13 +299,14 @@ public class IndexServiceTest { private CandidateResults getResults( final ApplicationEntityIndex applicationEntityIndex, - final SearchEdge searchEdge, final SearchTypes searchTypes, final String ql, - final int count, final int expectedSize, final int attempts ) { - + final SearchEdge searchEdge, final SearchTypes searchTypes, + final int expectedSize ) { + final int attempts = 100; + String ql = "select *"; for ( int i = 0; i < attempts; i++ ) { final CandidateResults candidateResults = - applicationEntityIndex.search( searchEdge, searchTypes, ql , count, 0 ); + applicationEntityIndex.search( searchEdge, searchTypes, ql , 100, 0 ); if ( candidateResults.size() == expectedSize ) { return candidateResults; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c22f30a7/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java index de5e29d..4c1e1c0 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java @@ -152,9 +152,7 @@ public class IndexingUtils { sb.append( version.toString() ); sb.append( FIELD_SEPERATOR ); - - idString( searchEdge.getNodeId() ); - + sb.append(idString( searchEdge.getNodeId() )); sb.append( FIELD_SEPERATOR ); sb.append( searchEdge.getEdgeName() ); sb.append( FIELD_SEPERATOR );
