usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [01/15] git commit: Ignored test until mockito issues are resolved
Date Fri, 04 Apr 2014 15:20:52 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/pull/77/head 5a1bcb977 -> b1c1219b8
  refs/pull/77/merge e4a9ae6de -> 7bfe637d3 (forced update)


Ignored test until mockito issues are resolved


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/289d66c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/289d66c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/289d66c8

Branch: refs/pull/77/head
Commit: 289d66c8d0de8d14b3ed60a6b5449bc06320a0bd
Parents: 9caf38b
Author: Todd Nine <tnine@apigee.com>
Authored: Thu Mar 27 15:02:33 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Thu Mar 27 15:02:33 2014 -0700

----------------------------------------------------------------------
 .../usergrid/persistence/graph/GraphManagerTimeoutIT.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/289d66c8/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerTimeoutIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerTimeoutIT.java
b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerTimeoutIT.java
index 8685b65..148d2a0 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerTimeoutIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerTimeoutIT.java
@@ -33,6 +33,7 @@ import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -65,12 +66,15 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 
 @RunWith( JukitoRunner.class )
 @UseModules( { TestGraphModule.class } )
+@Ignore("Mockings fail with mutliple threads, need to resolve this before enabling")
 //@UseModules( { TestGraphModule.class, GraphManagerIT.InvalidInput.class } )
 public class GraphManagerTimeoutIT {
 
@@ -134,7 +138,7 @@ public class GraphManagerTimeoutIT {
 
         //TODO, T.N. replace this with a different mock, the spies don't work with multi
threading like RX
         //https://code.google.com/p/mockito/wiki/FAQ#Is_Mockito_thread-safe?
-        when( serialization.getEdgesFromSource( scope, search ) ).thenReturn( itr );
+        when( serialization.getEdgesFromSource( same(scope), same(search) ) ).thenReturn(
itr );
 
         Observable<Edge> edges = em.loadEdgesFromSource( search );
 
@@ -179,6 +183,9 @@ public class GraphManagerTimeoutIT {
     }
 
 
+
+
+
     private class MockingIterator<T> implements Iterator<T> {
 
         private final Iterator<T> items;


Mime
View raw message