You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/02/08 02:20:41 UTC
[2/2] git commit: Updated tests to match method renaming. Still needs
reviewed
Updated tests to match method renaming. Still needs reviewed
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e24f3d28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e24f3d28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e24f3d28
Branch: refs/heads/two-dot-o
Commit: e24f3d285bb7537eed45ce8fb84723c314bd1c24
Parents: 2272a9d
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Feb 7 18:00:00 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Feb 7 18:00:00 2014 -0700
----------------------------------------------------------------------
.../persistence/graph/impl/EdgeManagerImpl.java | 8 ++---
.../persistence/graph/EdgeManagerIT.java | 36 ++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e24f3d28/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/EdgeManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/EdgeManagerImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/EdgeManagerImpl.java
index 2784519..5100119 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/EdgeManagerImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/EdgeManagerImpl.java
@@ -128,7 +128,7 @@ public class EdgeManagerImpl implements EdgeManager {
return Observable.create( new ObservableIterator<String>() {
@Override
protected Iterator<String> getIterator() {
- return edgeMetadataSerialization.getEdgeTypesToTarget( scope, search );
+ return edgeMetadataSerialization.getEdgeTypesFromSource( scope, search );
}
} );
@@ -140,7 +140,7 @@ public class EdgeManagerImpl implements EdgeManager {
return Observable.create( new ObservableIterator<String>() {
@Override
protected Iterator<String> getIterator() {
- return edgeMetadataSerialization.getIdTypesToTarget( scope, search );
+ return edgeMetadataSerialization.getIdTypesFromSource( scope, search );
}
} );
}
@@ -152,7 +152,7 @@ public class EdgeManagerImpl implements EdgeManager {
return Observable.create( new ObservableIterator<String>() {
@Override
protected Iterator<String> getIterator() {
- return edgeMetadataSerialization.getEdgeTypesFromSource( scope, search );
+ return edgeMetadataSerialization.getEdgeTypesToTarget( scope, search );
}
} );
}
@@ -163,7 +163,7 @@ public class EdgeManagerImpl implements EdgeManager {
return Observable.create( new ObservableIterator<String>() {
@Override
protected Iterator<String> getIterator() {
- return edgeMetadataSerialization.getIdTypesFromSource( scope, search );
+ return edgeMetadataSerialization.getIdTypesToTarget( scope, search );
}
} );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e24f3d28/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
index cd079e6..2308019 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
@@ -535,7 +535,7 @@ public class EdgeManagerIT {
//get our 2 edge types
Observable<String> edges =
- em.getEdgeTypesToTarget( new SimpleSearchEdgeType( testTargetEdge.getSourceNode(), null ) );
+ em.getEdgeTypesFromSource( new SimpleSearchEdgeType( testTargetEdge.getSourceNode(), null ) );
List<String> results = edges.toList().toBlockingObservable().single();
@@ -548,24 +548,24 @@ public class EdgeManagerIT {
//now test sub edges
- edges = em.getIdTypesToTarget( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test", null ) );
+ edges = em.getIdTypesFromSource( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test", null ) );
results = edges.toList().toBlockingObservable().single();
assertEquals( "Size correct", 2, results.size() );
- assertTrue( "Types correct", results.contains( targetId1 ) );
+ assertTrue( "Types correct", results.contains( targetId1.getType() ) );
- assertTrue( "Types correct", results.contains( targetId2 ) );
+ assertTrue( "Types correct", results.contains( targetId2.getType() ) );
//now get types for test2
- edges = em.getIdTypesToTarget( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test2", null ) );
+ edges = em.getIdTypesFromSource( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test2", null ) );
results = edges.toList().toBlockingObservable().single();
assertEquals( "Size correct", 1, results.size() );
- assertTrue( "Types correct", results.contains( targetId1 ) );
+ assertTrue( "Types correct", results.contains( targetId1.getType() ) );
//now delete our edges, we shouldn't get anything back
em.deleteEdge( testTargetEdge );
@@ -608,7 +608,7 @@ public class EdgeManagerIT {
//get our 2 edge types
final SearchEdgeType edgeTypes = new SimpleSearchEdgeType( testTargetEdge.getTargetNode(), null );
- Observable<String> edges = em.getEdgeTypesFromSource( edgeTypes );
+ Observable<String> edges = em.getEdgeTypesToTarget( edgeTypes );
List<String> results = edges.toList().toBlockingObservable().single();
@@ -622,7 +622,7 @@ public class EdgeManagerIT {
//now test sub edges
- edges = em.getEdgeTypesFromSource( new SimpleSearchIdType( testTargetEdge.getTargetNode(), "test", null ) );
+ edges = em.getEdgeTypesToTarget( new SimpleSearchIdType( testTargetEdge.getTargetNode(), "test", null ) );
results = edges.toList().toBlockingObservable().single();
@@ -634,7 +634,7 @@ public class EdgeManagerIT {
//now get types for test2
- edges = em.getIdTypesFromSource( new SimpleSearchIdType( testTargetEdge.getTargetNode(), "test2", null ) );
+ edges = em.getIdTypesToTarget( new SimpleSearchIdType( testTargetEdge.getTargetNode(), "test2", null ) );
results = edges.toList().toBlockingObservable().single();
@@ -648,7 +648,7 @@ public class EdgeManagerIT {
em.deleteEdge( test2TargetEdge );
- edges = em.getEdgeTypesToTarget( new SimpleSearchEdgeType( testTargetEdge.getSourceNode(), null ) );
+ edges = em.getEdgeTypesFromSource( new SimpleSearchEdgeType( testTargetEdge.getSourceNode(), null ) );
results = edges.toList().toBlockingObservable().single();
@@ -668,17 +668,17 @@ public class EdgeManagerIT {
Edge testTargetEdge = new SimpleEdge( sourceId1, "test", targetId1, UUIDGenerator.newTimeUUID() );
- em.writeEdge( testTargetEdge ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( testTargetEdge ).toBlockingObservable().singleOrDefault( null );
Edge testTargetEdge2 = new SimpleEdge( sourceId1, "test", targetId2, UUIDGenerator.newTimeUUID() );
- em.writeEdge( testTargetEdge2 ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( testTargetEdge2 ).toBlockingObservable().singleOrDefault( null );
Edge test2TargetEdge = new SimpleEdge( sourceId1, "test2", targetId2, UUIDGenerator.newTimeUUID() );
- em.writeEdge( test2TargetEdge ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( test2TargetEdge ).toBlockingObservable().singleOrDefault( null );
//get our 2 edge types
@@ -707,7 +707,7 @@ public class EdgeManagerIT {
//now test sub edges
- edges = em.getIdTypesToTarget( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test", null ) );
+ edges = em.getIdTypesFromSource( new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test", null ) );
results = edges.toBlockingObservable().getIterator();
@@ -716,7 +716,7 @@ public class EdgeManagerIT {
//now get the next page
- edges = em.getIdTypesToTarget(
+ edges = em.getIdTypesFromSource(
new SimpleSearchIdType( testTargetEdge.getSourceNode(), "test", targetId1.getType() ) );
results = edges.toBlockingObservable().getIterator();
@@ -740,16 +740,16 @@ public class EdgeManagerIT {
Edge testTargetEdge = new SimpleEdge( sourceId1, "test", targetId, UUIDGenerator.newTimeUUID() );
- em.writeEdge( testTargetEdge ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( testTargetEdge ).toBlockingObservable().singleOrDefault( null );
Edge testTargetEdge2 = new SimpleEdge( sourceId2, "test", targetId, UUIDGenerator.newTimeUUID() );
- em.writeEdge( testTargetEdge2 ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( testTargetEdge2 ).toBlockingObservable().singleOrDefault( null );
Edge test2TargetEdge = new SimpleEdge( sourceId2, "test2", targetId, UUIDGenerator.newTimeUUID() );
- em.writeEdge( test2TargetEdge ).toBlockingObservable().singleOrDefault( null );;
+ em.writeEdge( test2TargetEdge ).toBlockingObservable().singleOrDefault( null );
//get our 2 edge types