changeset 37:c6809d43da62

Merge with 0af5489d54064d1ecbdd5de5b58fae6a5cfef35d
author one
date Sun, 09 Nov 2014 23:01:40 +0900
parents f467001679e5 (current diff) 0af5489d5406 (diff)
children 7e6f1f9b40a8
files src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Sun Nov 09 23:01:19 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Sun Nov 09 23:01:40 2014 +0900
@@ -16,14 +16,18 @@
 		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");
+//		Assert.assertTrue(childrenIds.hasNext());
+//		Assert.assertEquals(childrenIds.next(),"o:4");
 		
 		jugrix = new JuGrix(true);
     filterIds = new LinkedList<String>();
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Sun Nov 09 23:01:19 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Sun Nov 09 23:01:40 2014 +0900
@@ -14,12 +14,12 @@
 	public void TestDeepChildOrganizationIds() {
 		JuGrix jugrix = new JuGrix(false);
 		LinkedList<String> filterIds = new LinkedList<String>();
-		filterIds.add("r:5");
+		filterIds.add("r:31");
 		Iterator<String> childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
 
 		Assert.assertTrue(childrenIds.hasNext());
 		String childrenId = childrenIds.next();
-		Assert.assertEquals(childrenId, "o:4");
+		Assert.assertEquals(childrenId, "o:9");
 
 		filterIds.add("rde:4");
 		childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
@@ -31,8 +31,8 @@
 		
 		jugrix = new JuGrix(true);
     filterIds = new LinkedList<String>();
-    filterIds.add("r:5");
-    childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
+    filterIds.add("r:31");
+    childrenIds = jugrix.deepChildOrganizationIds("o:9", filterIds);
 
     Assert.assertTrue(childrenIds.hasNext());
     childrenId = childrenIds.next();