diff src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java @ 54:650fe2a0dccc

modified tests
author Shoshi TAMAKI
date Fri, 08 Feb 2013 17:08:42 +0900
parents e3a507fd57a4
children 053c9b52a5b2
line wrap: on
line diff
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java	Fri Feb 08 12:32:37 2013 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java	Fri Feb 08 17:08:42 2013 +0900
@@ -7,7 +7,7 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.AppendChildAt;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.tests.util.TestUtil;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.ClonableDefaultNode;
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultEvaluator;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.Traversal;
@@ -26,36 +26,36 @@
 	
 	public void testEdittingDoesNotEffectToOtherTree()
 	{
-		ClonableDefaultNode root = TestUtil.createMockTree(3);
+		DefaultTreeNode root = TestUtil.createMockTree(3);
 		DefaultTreeEditor editor = new DefaultTreeEditor(new DefaultTraverser());
 		DefaultNodePath path = new DefaultNodePath().add(0).add(2);
 		
-		ClonableDefaultNode oldRoot = root;
+		DefaultTreeNode oldRoot = root;
 		
 		DefaultTreeEditor currentEditor = editor;
 		String key = "path";
 		
 		
-		ClonableDefaultNode currentRoot = root;
+		DefaultTreeNode currentRoot = root;
 		for(DefaultNodePath part : path.inits()){
 			ByteBuffer value = ByteBuffer.wrap(part.toString().getBytes());
 			PutAttribute putAttribute = new PutAttribute(key,value);
-			Either<Error,ClonableDefaultNode> either = currentEditor.edit(currentRoot,part,putAttribute);
+			Either<Error,DefaultTreeNode> either = currentEditor.edit(currentRoot,part,putAttribute);
 			if(either.isA()){
 				Assert.fail();
 			}
 			currentRoot = either.b();
 		}
 		
-		ClonableDefaultNode newRoot = currentRoot;
+		DefaultTreeNode newRoot = currentRoot;
 		DefaultTraverser traverser = new DefaultTraverser();
 		
 		for(DefaultNodePath part : path.inits()){
-			Either<Error,Traversal<TraversableNodeWrapper<ClonableDefaultNode>>> either = traverser.traverse(new TraversableNodeWrapper<ClonableDefaultNode>(newRoot),new DefaultEvaluator(part));
+			Either<Error,Traversal<TraversableNodeWrapper<DefaultTreeNode>>> either = traverser.traverse(new TraversableNodeWrapper<DefaultTreeNode>(newRoot),new DefaultEvaluator(part));
 			if(either.isA()){
 				Assert.fail();
 			}
-			ClonableDefaultNode target = either.b().destination().getWrapped();
+			DefaultTreeNode target = either.b().destination().getWrapped();
 			String expected = part.toString();
 			String actual = new String(target.getAttributes().get(key).array());
 			
@@ -63,11 +63,11 @@
 		}
 		
 		for(DefaultNodePath part : path.inits()){
-			Either<Error,Traversal<TraversableNodeWrapper<ClonableDefaultNode>>> either = traverser.traverse(new TraversableNodeWrapper<ClonableDefaultNode>(oldRoot),new DefaultEvaluator(part));
+			Either<Error,Traversal<TraversableNodeWrapper<DefaultTreeNode>>> either = traverser.traverse(new TraversableNodeWrapper<DefaultTreeNode>(oldRoot),new DefaultEvaluator(part));
 			if(either.isA()){
 				Assert.fail();
 			}
-			ClonableDefaultNode target = either.b().destination().getWrapped();
+			DefaultTreeNode target = either.b().destination().getWrapped();
 			ByteBuffer actual = target.getAttributes().get(key);
 			
 			Assert.assertNull(actual);
@@ -78,14 +78,14 @@
 	public void testEdit()
 	{
 		DefaultTreeEditor instance = instance();
-		ClonableDefaultNode node = new ClonableDefaultNode();
+		DefaultTreeNode node = new DefaultTreeNode();
 		DefaultNodePath path = new DefaultNodePath();
 		
-		Either<Error,ClonableDefaultNode> either = instance.edit(node,path,new AppendChildAt(0));
+		Either<Error,DefaultTreeNode> either = instance.edit(node,path,new AppendChildAt(0));
 		if(either.isA()){
 			Assert.fail();
 		}
-		ClonableDefaultNode newRoot = either.b();
+		DefaultTreeNode newRoot = either.b();
 		Assert.assertEquals(1,newRoot.getChildren().size());
 	}
 }