Kevin Trometer 7 роки тому
батько
коміт
4dc5828f16

+ 5 - 7
src/tests/PraktikumHolonsAdapter.java

@@ -1,8 +1,6 @@
 package tests;
 
 import java.util.ArrayList;
-import java.util.Iterator;
-
 import static java.lang.Math.*;
 
 import classes.Category;
@@ -10,11 +8,11 @@ import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-
-
+/**
+ * This Class Generates Stuff for the Tests.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsAdapter {
 
 	

+ 5 - 1
src/tests/PraktikumHolonsTestAutoSaveController.java

@@ -6,7 +6,11 @@ import static org.junit.Assert.*;
 
 import ui.controller.AutoSaveController;
 import ui.model.Model;
-
+/**
+ * Tests for the AutoSaveController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestAutoSaveController {
 	protected Model model;
 	protected AutoSaveController controller;

+ 5 - 1
src/tests/PraktikumHolonsTestCanvasController.java

@@ -15,7 +15,11 @@ import org.junit.Before;
 import static org.junit.Assert.assertTrue;
 
 import java.awt.Point;
-
+/**
+ * Tests for the CanvasController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestCanvasController {
 
 	protected PraktikumHolonsAdapter adapter;

+ 5 - 0
src/tests/PraktikumHolonsTestCategoryController.java

@@ -10,6 +10,11 @@ import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.model.Model;
 
+/**
+ * Tests for the CategoryController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestCategoryController {
 
 	protected PraktikumHolonsAdapter adapter;

+ 30 - 6
src/tests/PraktikumHolonsTestClasses.java

@@ -6,11 +6,18 @@ import static org.junit.Assert.assertTrue;
 import java.awt.Color;
 import java.util.ArrayList;
 
-import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Test for the Classes.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestClasses {
 
+	/**
+	 * Test for the Categories.
+	 */
 	@Test
 	public void testCategory() {
 		Category test1 = new Category("Test1");
@@ -35,6 +42,9 @@ public class PraktikumHolonsTestClasses {
 		assertTrue("Shoud not be empty", !arr.isEmpty());
 	}
 
+	/**
+	 * Test for HolonObject.
+	 */
 	@Test
 	public void testHolonObject() {
 
@@ -93,11 +103,14 @@ public class PraktikumHolonsTestClasses {
 		test1.setState();
 		assertTrue("Should be state 0", test1.getState() == 0);
 		test2.setState();
-		
+
 		test2.setBorderColor(color);
 		assertTrue("Color not Same", color == test2.getBorderColor());
 	}
 
+	/**
+	 * Test for HolonSwitch.
+	 */
 	@Test
 	public void testHolonSwitch() {
 		HolonSwitch test1 = new HolonSwitch("Test1");
@@ -123,6 +136,9 @@ public class PraktikumHolonsTestClasses {
 		assertTrue(test1.getGraphPoints() == test2.getGraphPoints());
 	}
 
+	/**
+	 * Test  for CpsEdge.
+	 */
 	@Test
 	public void testCpsEdge() {
 		CpsNode node1 = new CpsNode("Node1");
@@ -164,6 +180,9 @@ public class PraktikumHolonsTestClasses {
 		assertTrue("Tags Empty", !edge1.getTags().isEmpty());
 	}
 
+	/**
+	 * Test for HolonElement.
+	 */
 	@Test
 	public void testHolonElement() {
 		HolonElement ele1 = new HolonElement("TV", 2, -20);
@@ -186,16 +205,22 @@ public class PraktikumHolonsTestClasses {
 		assertTrue("SAV not correct", ele3.getSav().equals("CVS"));
 	}
 
+	/**
+	 * Test for Position.
+	 */
 	@Test
 	public void testPosition() {
 		Position pos1 = new Position(100, 200);
 		Position pos2 = new Position();
 
-		assertTrue("Wront coordinates", pos1.x == 100 && pos1.y == 200);
+		assertTrue("Wrong coordinates", pos1.x == 100 && pos1.y == 200);
 		assertTrue("Are the Same", pos1.x != pos2.x);
 		assertTrue("not (-1,-1)", pos2.x == -1 && pos2.y == -1);
 	}
 
+	/**
+	 * Test SubNet.
+	 */
 	@Test
 	public void testSubNet() {
 		PraktikumHolonsAdapter adapter = new PraktikumHolonsAdapter();
@@ -217,15 +242,14 @@ public class PraktikumHolonsTestClasses {
 			sw.add(s);
 			edge.add(new CpsEdge(o, s));
 		}
-		
+
 		SubNet sub = new SubNet(obj, edge, sw);
 
 		assertTrue("Empty", !sub.getObjects().isEmpty() && sub.getObjects().size() == 9);
 		assertTrue("Empty", !sub.getSwitches().isEmpty() && sub.getSwitches().size() == 9);
 		assertTrue("Empty", !sub.getEdges().isEmpty() && sub.getEdges().size() == 9);
 		assertTrue("Wrong Obj", sub.getObjects().get(5).getObjName().equals("F"));
-		
-		
+
 	}
 
 }

+ 11 - 2
src/tests/PraktikumHolonsTestConsoleController.java

@@ -7,15 +7,21 @@ import ui.controller.ConsoleController;
 import ui.model.Model;
 import ui.view.Console;
 
-import static org.junit.Assert.*;
-
 import java.awt.Color;
 
+/**
+ * Tests for the ConsoleController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestConsoleController {
 
 	protected Model model;
 	protected ConsoleController controller;
 
+	/**
+	 * Setup.
+	 */
 	@Before
 	public void setUp() {
 		model = new Model();
@@ -23,6 +29,9 @@ public class PraktikumHolonsTestConsoleController {
 		controller = new ConsoleController(model);
 	}
 
+	/**
+	 * Test for ConsoleController.
+	 */
 	@Test
 	public void testConsoleController() {
 		controller.addTextToConsole("Hello World");

+ 15 - 5
src/tests/PraktikumHolonsTestGlobalController.java

@@ -9,19 +9,29 @@ import java.util.ArrayList;
 import ui.controller.GlobalController;
 import ui.model.Model;
 
+/**
+ * Test for the GlobalController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestGlobalController {
 
 	protected Model model;
 	protected GlobalController controller;
 
-	
+	/**
+	 * Setup.
+	 */
 	@Before
 	public void setUp() {
 		model = new Model();
 		controller = new GlobalController(model);
 
 	}
-	
+
+	/**
+	 * Test for GlobalControls.
+	 */
 	@Test
 	public void testGlobalControls() {
 		int prevScale = controller.getScale();
@@ -30,20 +40,20 @@ public class PraktikumHolonsTestGlobalController {
 		boolean sim = model.getIsSimulation();
 		int timer = model.getTimerSpeed();
 		int it = model.getCurIteration();
-		
+
 		controller.setScale(100);
 		controller.setNumberOfSaves(50);
 		controller.setIsSimulation(true);
 		controller.setTimerSpeed(2000);
 		controller.setCurIteration(10);
-		
+
 		assertTrue("Scale was not changed", controller.getScale() != prevScale);
 		assertTrue("ScaleDiv2 was not changed ", model.getScaleDiv2() != prevScaleDiv2);
 		assertTrue("Number of Saves was not changed", controller.getNumbersOfSaves() != prevNumberSav);
 		assertTrue("Simulation State was not Set", sim != model.getIsSimulation());
 		assertTrue("Timer speed was not changed", timer != model.getTimerSpeed());
 		assertTrue("Curr Iteration was not Set", it != model.getCurIteration());
-		
+
 	}
 
 }

+ 13 - 9
src/tests/PraktikumHolonsTestLoadAndStoreController.java

@@ -9,15 +9,9 @@ import java.util.LinkedList;
 
 import org.junit.Before;
 import org.junit.Test;
-import java.lang.Error;
-
-import com.sun.security.auth.UnixNumericGroupPrincipal;
-
 import classes.Category;
 import classes.CpsEdge;
 
-import classes.CpsNode;
-
 import classes.AbstractCpsObject;
 
 import classes.HolonElement;
@@ -25,8 +19,6 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.IdCounter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import ui.controller.CanvasController;
@@ -38,6 +30,11 @@ import ui.controller.StoreController;
 import ui.model.Model;
 import ui.view.UnitGraph;
 
+/**
+ * Tests for LoadAndStoreController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestLoadAndStoreController {
 
 	protected PraktikumHolonsAdapter adapter;
@@ -107,7 +104,8 @@ public class PraktikumHolonsTestLoadAndStoreController {
 			assertTrue("Number of Categories does not match", model.getCategories().size() == i + 3);
 			assertTrue("Category was not created", mp.searchCat(adapter.generate(i)) != null);
 			for (int j = 1; j <= 10; j++) {
-				cg.addNewHolonObject(mp.searchCat(adapter.generate(i)), adapter.generate(j), new ArrayList<HolonElement>(), "");
+				cg.addNewHolonObject(mp.searchCat(adapter.generate(i)), adapter.generate(j),
+						new ArrayList<HolonElement>(), "");
 				assertTrue("Number of Objects does not match",
 						mp.searchCat(adapter.generate(i)).getObjects().size() == j);
 				assertTrue("Object was not created", mp.searchCat(adapter.generate(i)).getObjects().get(j - 1) != null);
@@ -292,6 +290,12 @@ public class PraktikumHolonsTestLoadAndStoreController {
 		}
 	}
 
+	/**
+	 * Test for FileNotFound.
+	 * 
+	 * @throws IOException
+	 *             FileNotFoundException
+	 */
 	@Test(expected = FileNotFoundException.class)
 	public void testLoadException() throws IOException {
 		assertTrue("Save File was not found", !new File(path + "TestSavDummy.json").exists());

+ 5 - 0
src/tests/PraktikumHolonsTestObjectController.java

@@ -13,6 +13,11 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.model.Model;
 
+/**
+ * Tests for the ObjectController.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestObjectController {
 
 	protected PraktikumHolonsAdapter adapter;

+ 5 - 0
src/tests/PraktikumHolonsTestSuite.java

@@ -4,6 +4,11 @@ import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+/**
+ * Test Suite for the Tests.
+ * 
+ * @author Gruppe14
+ */
 public class PraktikumHolonsTestSuite {
 
 

+ 0 - 1
src/ui/view/TimePanel.java

@@ -2,7 +2,6 @@ package ui.view;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.FlowLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;