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/praktikumHolonsTestCanvasController.java

@@ -1,11 +1,9 @@
 package tests;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import com.sun.xml.internal.ws.policy.spi.AssertionCreationException;
 
 import classes.CpsEdge;
 import classes.CpsObject;

src/tests/praktikumHolonsTestLoadAndStoreController.java

@@ -0,0 +1,83 @@
+package tests;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import classes.HolonObject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import ui.controller.CanvasController;
+import ui.controller.CategoryController;
+import ui.controller.LoadController;
+import ui.controller.MultiPurposeController;
+import ui.controller.ObjectController;
+import ui.controller.StoreController;
+import ui.model.Model;
+
+public class praktikumHolonsTestLoadAndStoreController {
+
+	protected praktikumHolonsAdapter adapter;
+	protected Model model;
+	protected MultiPurposeController mp;
+	protected CategoryController cg;
+	protected CanvasController cvs;
+	protected ObjectController obj;
+	protected StoreController storeController;
+	protected LoadController loadController;
+	protected String path = System.getProperty("user.home") + "/HolonGUI/Test/";
+	
+	
+	@Before
+	public void setUp() {
+		adapter = new praktikumHolonsAdapter();
+		model = new Model();
+		mp = new MultiPurposeController(model);
+		cg = new CategoryController(model, mp);
+		cvs = new CanvasController(model, mp);
+		obj = new ObjectController(model, mp);
+		storeController = new StoreController(model);
+		loadController = new LoadController(model, cg, cvs, obj, mp);
+		File file = new File(path);
+		file.mkdirs();
+	}
+	
+	@Test
+	public void testStoreMinimal(){
+		cg.initCategories();
+		obj.initHolonElements();
+		try {
+			File sav = new File(path + "TestSavMinimal.json");
+			storeController.writeSaveFile(sav.getAbsolutePath());
+			assertTrue("Save File was not created", new File(path + "TestSavMinimal.json").exists());
+			
+			File cat = new File(path + "TestCatMinimal.json");
+			storeController.writeCategoryFile(cat.getAbsolutePath());
+			assertTrue("Category File was not created", new File(path + "TestCatMinimal.json").exists());
+			
+			File canvas = new File(path + "TestCanvasMinimal.json");
+			storeController.writeCanvasFile(canvas.getAbsolutePath());
+			assertTrue("Canvas File was not created", new File(path + "TestCanvasMinimal.json").exists());
+			
+			assertTrue("Non Existant File exist", !new File(path + "TestDummyMinimal.json").exists());
+			
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	@Test
+	public void testStoreCanvas() {
+		for (int i = 1; i < 11; i++) {
+			cvs.addNewObject(new HolonObject(adapter.generate(i)));
+			assertTrue("Size of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == i);
+			assertTrue("Object was not created", mp.searchByID(i) != null && mp.searchByID(i).getObjName().equals(adapter.generate(i)));
+		}
+	}
+}

src/tests/praktikumHolonsTestLoadController.java

@@ -1,5 +0,0 @@
-package tests;
-
-public class praktikumHolonsTestLoadController {
-
-}

src/tests/praktikumHolonsTestObjectController.java

@@ -115,6 +115,22 @@ public class praktikumHolonsTestObjectController {
 			assertTrue("Element:B was not Found", mp
 					.searchEle((HolonObject) mp.searchByID(cps.getID()), "B") != null);	
 		}
+		
+		for (CpsObject cps : model.getObjectsOnCanvas()) {
+			int size = model.getSelectedCpsObjects().size();
+			controller.addSelectedObject(cps);
+			assertTrue("Size does not Match", model.getSelectedCpsObjects().size() == size +1);
+		}
+		for (CpsObject cps : model.getObjectsOnCanvas()) {
+			System.out.println(model.getSelectedCpsObjects().size());
+			int size = model.getSelectedCpsObjects().size();
+			controller.deleteSelectedObject(cps);
+			assertTrue("Size does not Match", model.getSelectedCpsObjects().size() == size -1);
+			assertTrue("Object was not unselected", !model.getSelectedCpsObjects().contains(cps));
+			
+		}
 	}
+	
+	
 
 }

src/tests/praktikumHolonsTestStoreController.java

@@ -1,5 +0,0 @@
-package tests;
-
-public class praktikumHolonsTestStoreController {
-
-}

src/tests/praktikumHolonsTestSuite.java

@@ -13,6 +13,11 @@ public class praktikumHolonsTestSuite {
 		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCategoryController.class));
 		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCanvasController.class));
 		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestObjectController.class));
+		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestLoadAndStoreController.class));
+//		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestLoadController.class));
+//		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestMultiPurposeController.class));
+//		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestGlobalController.class));
+//		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestAutoSaveController.class));
 		return suite;
 	}
 }

src/ui/controller/StoreController.java

@@ -19,12 +19,6 @@ import ui.model.Model;
 import ui.model.idCounter;
 
 public class StoreController {
-	
-	public enum MODE {
-		ALL,
-		CATEGORY,
-		CANVAS
-	}
 
 	private Model MODEL;