Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

src/tests/praktikumHolonsTestClasses.java

@@ -0,0 +1,8 @@
+package tests;
+
+import classes.*;
+
+public class praktikumHolonsTestClasses {
+
+	
+}

src/tests/praktikumHolonsTestLoadAndStoreController.java

@@ -86,7 +86,7 @@ public class praktikumHolonsTestLoadAndStoreController {
 	@Test
 	public void testStoreBasic() {
 
-		for (int i = 1; i <= 10; i++) {
+		for (int i = 1; i <= 26; i++) {
 			cg.addNewCategory(adapter.generate(i));
 			assertTrue("Number of Categories does not match", model.getCategories().size() == i + 3);
 			assertTrue("Category was not created", mp.searchCat(adapter.generate(i)) != null);
@@ -195,7 +195,64 @@ public class praktikumHolonsTestLoadAndStoreController {
 	
 	@Test
 	public void testLoadBasic() {
+		assertTrue("Non-Existant Category Exists", mp.searchCat("J") == null);
+		assertTrue("Non-Existant Category Exists", mp.searchCat("U") == null);
+		assertTrue("Non-Existant Category Exists", mp.searchCat("L") == null);
+		assertTrue("Non-Existant Category Exists", mp.searchCat("I") == null);
+		assertTrue("Non-Existant Category Exists", mp.searchCat("A") == null);
+		assertTrue("Non-Existant Category Exists", mp.searchCat("N") == null);
+		
 		
+		try {
+			assertTrue("Objects on Canvas is not 0", model.getObjectsOnCanvas().size() == 0);
+			assertTrue("Canvas File was not found", new File(path + "TestCanvasBasic.json").exists());
+			loadController.readJSON(path + "TestCanvasBasic.json");
+			assertTrue("NUmber of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == 10);
+			for (CpsObject obj : model.getObjectsOnCanvas()) {
+				assertTrue("Not instance of HolonObject", obj instanceof HolonObject);
+			}
+			
+			assertTrue("NUmber of Categories not match", model.getCategories().size() == 3);
+			assertTrue("Canvas File was not found", new File(path + "TestSavBasic.json").exists());
+			loadController.readJSON(path + "TestSavBasic.json");
+			assertTrue("NUmber of Categories not match", model.getCategories().size() == 29);
+			assertTrue("Existant Category dont Exists", mp.searchCat("J") != null);
+			assertTrue("Existant Category dont Exists", mp.searchCat("U") != null);
+			assertTrue("Existant Category dont Exists", mp.searchCat("L") != null);
+			assertTrue("Existant Category dont Exists", mp.searchCat("I") != null);
+			assertTrue("Existant Category dont Exists", mp.searchCat("A") != null);
+			assertTrue("Existant Category dont Exists", mp.searchCat("N") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "A") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "B") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "C") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "D") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "E") != null);
+			assertTrue("Existant Object dont Exists", mp.searchCatObj(mp.searchCat("Z"), "F") != null);
+			
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	@Test
+	public void testLoadAdvanced() {
+		
+		try {
+			assertTrue("Objects on Canvas is not 0", model.getObjectsOnCanvas().size() == 0);
+			assertTrue("Save File was not found", new File(path + "TestSavAdvanced.json").exists());
+			loadController.readJSON(path + "TestSavAdvanced.json");
+			assertTrue("Objects on Canvas is not 0", model.getObjectsOnCanvas().size() == 100);
+			
+			int n = model.getObjectsOnCanvas().size();
+			assertTrue("Number of Edges does not Match", model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
+			assertTrue("Element has no UnitGraph", !mp.searchEle((HolonObject)model.getObjectsOnCanvas().get(77), "Fridge").getGraphPoints().isEmpty());
+			assertTrue("Points in UnitGraph does not Match", mp.searchEle((HolonObject)model.getObjectsOnCanvas().get(77), "Fridge").getGraphPoints().size() == 3);
+
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	/**