Teh-Hai Julian Zheng 8 years ago
parent
commit
a5bff34f5c

+ 4 - 2
src/tests/PraktikumHolonsTestCanvasController.java

@@ -34,7 +34,7 @@ public class PraktikumHolonsTestCanvasController {
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);
 		controller = new CanvasController(model, mp);
-		IdCounter.setCounter(1);
+		IdCounter.setCounter(1); 
 	}
 
 	/**
@@ -75,6 +75,7 @@ public class PraktikumHolonsTestCanvasController {
 		controller.addNewObject(new HolonSwitch(mp.searchCatObj(mp.searchCat("Component"), "Switch")));
 		assertTrue("Number of Objects does not Match", model.getObjectsOnCanvas().size() == 10);
 	}
+	
 	/**
 	 * Tests deleting Objects.
 	 */
@@ -159,7 +160,7 @@ public class PraktikumHolonsTestCanvasController {
 	}
 	
 	/**
-	 * Test copying Objects.
+	 * Test copying, cutting and pasting Objects.
 	 */
 	@Test
 	public void testCutCopyPasteObjects() {
@@ -197,6 +198,7 @@ public class PraktikumHolonsTestCanvasController {
 		controller.addNewObject(b);
 		controller.addNewObject(c);
 		controller.cutObjects();
+		assertTrue("Objects still on canvas", model.getObjectsOnCanvas().isEmpty());
 		
 	}
 }

+ 2 - 0
src/tests/PraktikumHolonsTestCategoryController.java

@@ -142,6 +142,7 @@ public class PraktikumHolonsTestCategoryController {
 
 		for (int i = 1; i <= 25; i++) {
 			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i), null, null);
+			//creating duplicates
 			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i), null, null);
 
 			assertTrue("Objects were not added", mp.searchCat("Energy").getObjects().size() == i * 2 + 1);
@@ -149,6 +150,7 @@ public class PraktikumHolonsTestCategoryController {
 			assertTrue("Object was not renamed to \"" + adapter.generate(i) + "_0\"", mp.searchCat("Energy")
 					.getObjects().get(i * 2).getObjName().equals(adapter.generate(i) + "_0"));
 		}
+		//deleting the duplicates
 		controller.deleteObject("Energy", "E_0");
 		assertTrue("Object was not deleted", mp.searchCatObj(mp.searchCat("Energy"), "E_0") == null);
 		controller.deleteObject("Energy", "F_0");