diff src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java @ 42:c036d36c33af

function refactor
author one
date Tue, 25 Nov 2014 11:57:17 +0900
parents 96dcbd8e2fcb
children 1bdd50e26fac
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java	Thu Nov 13 23:34:41 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java	Tue Nov 25 11:57:17 2014 +0900
@@ -14,44 +14,37 @@
   @Test
   public void testPersonIds() {
 
-    JuGrix jugrix = new JuGrix(false);
+    JuGrix jugrix = new JuGrix();
     LinkedList<String> filterIds = new LinkedList<String>();
+    
+    Iterator<String> ids = jugrix.personIds("o:2", filterIds);
+    Assert.assertTrue(ids.hasNext());
+    Assert.assertEquals(ids.next(), "p:1");
+    Assert.assertTrue(ids.hasNext());
+    Assert.assertEquals(ids.next(), "p:45");
+    
     filterIds.add("r:9");
-    Iterator<String> ids = jugrix.personIds("o:2", filterIds);
+    ids = jugrix.personIds("o:2", filterIds);
 
     Assert.assertTrue(ids.hasNext());
     Assert.assertEquals(ids.next(), "p:45");
+    Assert.assertTrue(ids.hasNext());
     Assert.assertEquals(ids.next(), "p:1");
 
+
     filterIds.add("rde:3");
     ids = jugrix.personIds("o:2", filterIds);
 
     ids.hasNext();
     Assert.assertEquals(ids.next(), "p:45");
+    ids.hasNext();
     Assert.assertEquals(ids.next(), "p:1");
 
+
+
     filterIds.add("rde:322");
     ids = jugrix.personIds("o:2", filterIds);
     Assert.assertFalse(ids.hasNext());
     
-    jugrix = new JuGrix(true);
-    filterIds = new LinkedList<String>();
-    filterIds.add("r:9");
-    ids = jugrix.personIds("o:2", filterIds);
-
-    ids.hasNext();
-    Assert.assertEquals(ids.next(), "p:45");
-    Assert.assertEquals(ids.next(), "p:1");
-
-    filterIds.add("rde:3");
-    ids = jugrix.personIds("o:2", filterIds);
-
-    ids.hasNext();
-    Assert.assertEquals(ids.next(), "p:45");
-    Assert.assertEquals(ids.next(), "p:1");
-
-    filterIds.add("rde:322");
-    ids = jugrix.personIds("o:2", filterIds);
-    Assert.assertFalse(ids.hasNext());
-  }
+   }
 }