# HG changeset patch
# User one
# Date 1415542203 -32400
# Node ID 7e6f1f9b40a85050aeb75cce9531f6babf39cb2c
# Parent  c6809d43da62c3fabc80e258ee5b783818fdecd6
merge fix

diff -r c6809d43da62 -r 7e6f1f9b40a8 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java
--- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Sun Nov 09 23:01:40 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Sun Nov 09 23:10:03 2014 +0900
@@ -1110,6 +1110,5 @@
     };
 
   }
-  
+
 }
-
diff -r c6809d43da62 -r 7e6f1f9b40a8 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Sun Nov 09 23:01:40 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Sun Nov 09 23:10:03 2014 +0900
@@ -10,26 +10,22 @@
 
 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);
-		
-		for (;childrenIds.hasNext();) {
-		  System.out.println(childrenIds.next());
-		}
-		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);
+  @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);
@@ -41,5 +37,5 @@
     childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
     Assert.assertTrue(childrenIds.hasNext());
     Assert.assertEquals(childrenIds.next(),"o:4");
-	}
+  }
 }
diff -r c6809d43da62 -r 7e6f1f9b40a8 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Sun Nov 09 23:01:40 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Sun Nov 09 23:10:03 2014 +0900
@@ -10,29 +10,29 @@
 
 public class DeepChildOrganizationIdsTest {
 
-	@Test
-	public void TestDeepChildOrganizationIds() {
-		JuGrix jugrix = new JuGrix(false);
-		LinkedList<String> filterIds = new LinkedList<String>();
-		filterIds.add("r:31");
-		Iterator<String> childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
+  @Test
+  public void TestDeepChildOrganizationIds() {
+    JuGrix jugrix = new JuGrix(false);
+    LinkedList<String> filterIds = new LinkedList<String>();
+    filterIds.add("r:5");
+    Iterator<String> childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
 
-		Assert.assertTrue(childrenIds.hasNext());
-		String childrenId = childrenIds.next();
-		Assert.assertEquals(childrenId, "o:9");
+    Assert.assertTrue(childrenIds.hasNext());
+    String childrenId = childrenIds.next();
+    Assert.assertEquals(childrenId, "o:4");
 
-		filterIds.add("rde:4");
-		childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
+    filterIds.add("rde:4");
+    childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
 
-		Assert.assertTrue(childrenIds.hasNext());
-		childrenId = childrenIds.next();
-		Assert.assertEquals(childrenId, "o:4");
+    Assert.assertTrue(childrenIds.hasNext());
+    childrenId = childrenIds.next();
+    Assert.assertEquals(childrenId, "o:4");
     Assert.assertFalse(childrenIds.hasNext());
-		
-		jugrix = new JuGrix(true);
+    
+    jugrix = new JuGrix(true);
     filterIds = new LinkedList<String>();
-    filterIds.add("r:31");
-    childrenIds = jugrix.deepChildOrganizationIds("o:9", filterIds);
+    filterIds.add("r:5");
+    childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
 
     Assert.assertTrue(childrenIds.hasNext());
     childrenId = childrenIds.next();
@@ -44,5 +44,5 @@
     Assert.assertTrue(childrenIds.hasNext());
     childrenId = childrenIds.next();
     Assert.assertEquals(childrenId, "o:4");
-	}
+  }
 }