Explorar el Código

small fix loading

Teh-Hai Julian Zheng hace 8 años
padre
commit
a6ea23b030

+ 0 - 1
src/tests/praktikumHolonsTestCategoryController.java

@@ -23,7 +23,6 @@ public class praktikumHolonsTestCategoryController {
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		controller = new CategoryController(model, mp);
-
 	}
 
 	@Test

+ 33 - 0
src/tests/praktikumHolonsTestObjectController.java

@@ -0,0 +1,33 @@
+package tests;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import ui.controller.CategoryController;
+import ui.controller.MultiPurposeController;
+import ui.controller.ObjectController;
+import ui.model.Model;
+
+public class praktikumHolonsTestObjectController {
+
+	
+	protected praktikumHolonsAdapter adapter;
+	protected Model model;
+	protected MultiPurposeController mp;
+	protected CategoryController cg;
+	protected ObjectController controller;
+
+	@Before
+	public void setUp() {
+		adapter = new praktikumHolonsAdapter();
+		model = new Model();
+		mp = new MultiPurposeController(model);
+		cg = new CategoryController(model, mp);
+		controller = new ObjectController(model, mp);
+	}
+	
+	@Test
+	public void testInitialHolonElements() {
+		
+	}
+}

+ 3 - 0
src/tests/praktikumHolonsTestSuite.java

@@ -6,10 +6,13 @@ import junit.framework.TestSuite;
 
 public class praktikumHolonsTestSuite {
 
+
+	//Test Suite
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Tests for prakikum-holons");
 		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCategoryController.class));
 		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCanvasController.class));
+		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestObjectController.class));
 		return suite;
 	}
 }

+ 1 - 0
src/ui/controller/LoadController.java

@@ -72,6 +72,7 @@ public class LoadController {
 		if (mode.equals(MODE.ALL) || mode.equals(MODE.CATEGORY)) {
 			MODEL.setCgIdx(new HashMap<String, Integer>());
 			MODEL.setCategories(new ArrayList<Category>());
+			MODEL.setEdgesOnCanvas(new ArrayList<>());
 		}
 		if (mode.equals(MODE.ALL) || mode.equals(MODE.CATEGORY)) {
 			MODEL.setCvsObjIdx(new HashMap<Integer, Integer>());