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

function refactor
author one
date Tue, 25 Nov 2014 11:57:17 +0900
parents b8d86bc46b51
children 5e8eac03fed3
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java	Thu Nov 13 23:34:41 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java	Tue Nov 25 11:57:17 2014 +0900
@@ -1,6 +1,7 @@
 package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest;
 
 import java.util.Iterator;
+import java.util.LinkedList;
 
 import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix;
 import junit.framework.Assert;
@@ -11,29 +12,23 @@
 
   @Test
   public void testRoleIds() {
-    JuGrix jugrix = new JuGrix(false);
-    Iterator<String> orgIds = jugrix.roleIds("o:6");
+    JuGrix jugrix = new JuGrix();
+    LinkedList<String> filterIds = new LinkedList<String>();
+    filterIds.add("o:5");
+    Iterator<String> orgIds = jugrix.roleIds("o:6",filterIds);
     orgIds.hasNext();
     Assert.assertEquals(orgIds.next(), "r:18");
     Assert.assertFalse(orgIds.hasNext());
 
-    Iterator<String> personIds = jugrix.roleIds("p:1");
-    personIds.hasNext();
-    Assert.assertEquals(personIds.next(), "r:34");
-    personIds.hasNext();
-    Assert.assertEquals(personIds.next(), "r:10");
     
-    jugrix = new JuGrix(true);
-    orgIds = jugrix.roleIds("o:6");
-    orgIds.hasNext();
-    Assert.assertEquals(orgIds.next(), "r:18");
-    Assert.assertFalse(orgIds.hasNext());
-
-    personIds = jugrix.roleIds("p:1");
-    personIds.hasNext();
-    Assert.assertEquals(personIds.next(), "r:34");
+    filterIds = new LinkedList<String>();
+    filterIds.add("o:2");
+    
+    Iterator<String> personIds = jugrix.roleIds("p:1",filterIds);
     personIds.hasNext();
     Assert.assertEquals(personIds.next(), "r:10");
 
+    
+
   }
 }