Quellcode durchsuchen

Category adding deleting objects test extended, new test suite included

Teh-Hai Julian Zheng vor 8 Jahren
Ursprung
Commit
00683a108b

+ 14 - 3
src/tests/praktikumHolonsTestCategoryController.java

@@ -123,11 +123,22 @@ public class praktikumHolonsTestCategoryController {
 	@Test
 	public void testAddingAndDeletingObjectsExtended() {
 
-		for (int i = 1; i <= 50; i++) {
+		for (int i = 1; i <= 25; i++) {
+			controller.addNewHolonObject(mp.searchCategory("Energy"), adapter.generate(i), null, null);
 			controller.addNewHolonObject(mp.searchCategory("Energy"), adapter.generate(i), null, null);
-			assertTrue("Object:" + adapter.generate(i+1) + " was not added",
-					mp.searchCategory("Energy").getObjects().size() == i + 1);
 
+			assertTrue("Objects were not added", mp.searchCategory("Energy").getObjects().size() == i * 2 + 1);
+
+			assertTrue("Object was not renamed to \"" + adapter.generate(i) + "_0\"", mp.searchCategory("Energy")
+					.getObjects().get(i * 2).getObjName().equals(adapter.generate(i) + "_0"));
 		}
+		controller.deleteObject("Energy", "E_0");
+		assertTrue("Object was not deleted", mp.searchCategoryObject(mp.searchCategory("Energy"), "E_0") == null);
+		controller.deleteObject("Energy", "F_0");
+		assertTrue("Object was not deleted", mp.searchCategoryObject(mp.searchCategory("Energy"), "F_0") == null);
+		controller.deleteObject("Energy", "G_0");
+		assertTrue("Object was not deleted", mp.searchCategoryObject(mp.searchCategory("Energy"), "G_0") == null);
+		controller.deleteObject("Energy", "H_0");
+		assertTrue("Object was not deleted", mp.searchCategoryObject(mp.searchCategory("Energy"), "H_0") == null);
 	}
 }

+ 15 - 0
src/tests/praktikumHolonsTestSuite.java

@@ -0,0 +1,15 @@
+package tests;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class praktikumHolonsTestSuite {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Tests for prakikum-holons");
+		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCategoryController.class));
+		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCanvasController.class));
+		return suite;
+	}
+}