diff src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/ParentIndexTest.java @ 157:f98f2704b154 untilIndex

minnerChange
author one
date Sun, 07 Dec 2014 18:43:32 +0900
parents d9fbddf77bf6
children
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/ParentIndexTest.java	Sun Dec 07 15:24:30 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/ParentIndexTest.java	Sun Dec 07 18:43:32 2014 +0900
@@ -7,22 +7,26 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath;
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser;
 import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.ParentIndex;
 import junit.framework.Assert;
+
 import org.junit.Test;
+
 import fj.data.Option;
 
 public class ParentIndexTest {
 
   @Test
   public void testParentIndex() {
-    Jungle jungle = new DefaultJungle(null, "hogehoge", new DefaultTraverser());
+    Jungle jungle = new DefaultJungle(null, "hogehoge", new DefaultTreeEditor (new DefaultTraverser()));
     jungle.createNewTree("tree");
     JungleTree tree = jungle.getTreeByName("tree");
-    JungleTreeEditor editor = tree.getIndexTreeEditor();
+    JungleTreeEditor editor = tree.getTreeEditor();
     DefaultNodePath path = new DefaultNodePath();
     editor = editor.addNewChildAt(path, 0).b();
 
@@ -38,7 +42,7 @@
       Iterator<TreeNode> children = node.getChildren().iterator();
       for (; children.hasNext();) {
         TreeNode child = children.next();
-        TreeNode parent = parentIndex.get(child).some();
+        TreeNode parent = parentIndex.get(child);
         Assert.assertEquals(parent, node);
       }
       node = node.getChildren().at(num).b();
@@ -47,11 +51,11 @@
     JungleTree oldTree = tree.getOldTree(tree.revision() - 1).b();
     TreeNode oldRoot = oldTree.getRootNode();
     TreeNode oldNode = oldRoot.getChildren().at(0).b();
-    Option<TreeNode> oldParentOp = parentIndex.get(oldNode);
-    Assert.assertTrue(oldParentOp.isNone());
+    TreeNode oldParent = parentIndex.get(oldNode);
+    Assert.assertTrue(oldParent == null);
     ParentIndex oldTreeParentIndex = oldTree.getParentIndex();
-    oldParentOp = oldTreeParentIndex.get(oldNode);
-    Assert.assertTrue(oldParentOp.isSome());
+    oldParent = oldTreeParentIndex.get(oldNode);
+    Assert.assertTrue(oldParent != null);
 
   }
 }