test

src/tests/PraktikumHolonsTestClasses.java

@@ -16,11 +16,7 @@ import org.junit.Test;
 public class PraktikumHolonsTestClasses {
 
 	/**
-<<<<<<< HEAD
-	 * Tests for the Category Class.
-=======
 	 * Test for the Categories.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testCategory() {
@@ -47,11 +43,7 @@ public class PraktikumHolonsTestClasses {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for the HolonObject Class.
-=======
 	 * Test for HolonObject.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testHolonObject() {
@@ -107,20 +99,12 @@ public class PraktikumHolonsTestClasses {
 		test1.setState();
 		assertTrue("Should be state 0", test1.getState() == 0);
 		test2.setState();
-<<<<<<< HEAD
-=======
-
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 		test2.setBorderColor(color);
 		assertTrue("Color not Same", color == test2.getBorderColor());
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for HolonSwitch Class.
-=======
 	 * Test for HolonSwitch.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testHolonSwitch() {
@@ -148,11 +132,7 @@ public class PraktikumHolonsTestClasses {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for CpsEdge Class.
-=======
-	 * Test  for CpsEdge.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
+	 * Test for CpsEdge.
 	 */
 	@Test
 	public void testCpsEdge() {
@@ -196,11 +176,7 @@ public class PraktikumHolonsTestClasses {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for HolonElement Class.
-=======
 	 * Test for HolonElement.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testHolonElement() {
@@ -225,11 +201,7 @@ public class PraktikumHolonsTestClasses {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for Position Class.
-=======
 	 * Test for Position.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testPosition() {
@@ -242,11 +214,7 @@ public class PraktikumHolonsTestClasses {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Tests for SubNet Class.
-=======
 	 * Test SubNet.
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	 */
 	@Test
 	public void testSubNet() {

src/tests/PraktikumHolonsTestGlobalController.java

@@ -19,32 +19,21 @@ public class PraktikumHolonsTestGlobalController {
 	protected Model model;
 	protected GlobalController controller;
 
-<<<<<<< HEAD
-	 
-=======
+
 	/**
 	 * Setup.
 	 */
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	@Before
 	public void setUp() {
 		model = new Model();
 		controller = new GlobalController(model);
 
 	}
-<<<<<<< HEAD
-	
-	/**
-	 * Test the methods for Global attributes.
-	 */
-	@Test 
-=======
 
 	/**
 	 * Test for GlobalControls.
 	 */
 	@Test
->>>>>>> 90bc29b29bece3f981eca7b6bd629093b2c90382
 	public void testGlobalControls() {
 		int prevScale = controller.getScale();
 		int prevScaleDiv2 = controller.getScaleDiv2();