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

function refactor
author one
date Tue, 25 Nov 2014 11:57:17 +0900
parents 7e6f1f9b40a8
children 5e8eac03fed3
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Thu Nov 13 23:34:41 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Tue Nov 25 11:57:17 2014 +0900
@@ -11,31 +11,30 @@
 public class DeepChildOrganizationIdsPlusTest {
 
   @Test
-  public void TestDeepChildOrganizationIdsPlus(){
-    JuGrix jugrix = new JuGrix(false);
-    LinkedList<String> filterIds = new LinkedList<String>();
-    filterIds.add("r:9");
-    Iterator<String> childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
-    Assert.assertTrue(childrenIds.hasNext());
-    Assert.assertEquals(childrenIds.next(),"o:2");
-    
-    filterIds = new LinkedList<String>();
-    filterIds.add("r:5");
-    childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
-    Assert.assertTrue(childrenIds.hasNext());
-    Assert.assertEquals(childrenIds.next(),"o:4");
-    
-    jugrix = new JuGrix(true);
-    filterIds = new LinkedList<String>();
-    filterIds.add("r:9");
-    childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
-    Assert.assertTrue(childrenIds.hasNext());
-    Assert.assertEquals(childrenIds.next(),"o:2");
-    
-    filterIds = new LinkedList<String>();
-    filterIds.add("r:5");
-    childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
-    Assert.assertTrue(childrenIds.hasNext());
-    Assert.assertEquals(childrenIds.next(),"o:4");
+  public void TestDeepChildOrganizationIdsPlus() {
+
+    JuGrix jugrix = new JuGrix();
+      LinkedList<String> filterIds = new LinkedList<String>();
+      Iterator<String> childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
+      Assert.assertTrue(childrenIds.hasNext());
+      String orgId = childrenIds.next();
+      Assert.assertEquals(orgId, "o:2");
+      Assert.assertTrue(childrenIds.hasNext());
+      orgId = childrenIds.next();
+      Assert.assertEquals(orgId, "o:3");
+
+      filterIds.add("r:9");
+      childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
+      Assert.assertTrue(childrenIds.hasNext());
+      orgId = childrenIds.next();
+      Assert.assertEquals(orgId, "o:2");
+      
+      filterIds.add("rde:3");
+      childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
+      Assert.assertTrue(childrenIds.hasNext());
+      orgId = childrenIds.next();
+      Assert.assertEquals(orgId, "o:2");
+
+
   }
 }