diff src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java @ 143:afbe19c98f53

change Index form TreeMap<String,TreeMap<String<List<Pair<TreeNode,NodePath>>>> → TreeMap<String,TreeMap<String<List<NodePath>>> bag
author one
date Sat, 15 Nov 2014 17:48:07 +0900
parents f46a6e0e4594
children 0854f9a9e81d
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java	Thu Nov 13 22:04:14 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java	Sat Nov 15 17:48:07 2014 +0900
@@ -1,6 +1,6 @@
 package jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.index;
 
-import java.util.Iterator;
+
 
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle;
@@ -14,7 +14,6 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
 import junit.framework.Assert;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 
@@ -51,10 +50,12 @@
 		}, key, "<-1,0,1>");
 
 		//check index
-		TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> index = ifTraverser.getIndex();
-		Option<TreeMap<String, List<Pair<TreeNode, NodePath>>>> opIndex = index.get(key);
+		TreeMap<String, TreeMap<String, List<NodePath>>> index = ifTraverser.getIndex();
+		Option<TreeMap<String, List<NodePath>>> opIndex = index.get(key);
+		
 		Assert.assertTrue(!opIndex.isNone());
-		TreeMap<String, List<Pair<TreeNode, NodePath>>> innerIndex = opIndex.some();
+		
+		TreeMap<String, List< NodePath>> innerIndex = opIndex.some();
 		Assert.assertTrue(!innerIndex.get("<-1,0,0>").isNone());
 
 		JungleTreeEditor editor = tree.getTreeEditor();
@@ -65,7 +66,7 @@
 		ifTraverser.commitIndex();
 		JungleTree newTree = jungle.getTreeByName("tree");
 		InterfaceTraverser newIfTraverser = newTree.getTraverser();
-		TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> newIndex = newIfTraverser.getIndex();
+		TreeMap<String, TreeMap<String, List<NodePath>>> newIndex = newIfTraverser.getIndex();
 		Assert.assertTrue(newIndex.isEmpty());
 		
 		InterfaceTraverser ifTraverser1= tree.getTraverser();
@@ -84,7 +85,7 @@
 		ifTraverser1.commitIndex();
 		JungleTree newTree2 = jungle.getTreeByName("tree");
 		InterfaceTraverser newIfTraverser2 = newTree2.getTraverser();
-		TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> newIndex1 = newIfTraverser2.getIndex();
+		TreeMap<String, TreeMap<String, List<NodePath>>> newIndex1 = newIfTraverser2.getIndex();
 		Assert.assertFalse(newIndex1.isEmpty());
 
 	}