|
@@ -4,8 +4,6 @@ import org.junit.Before;
|
|
|
import org.junit.Test;
|
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-
|
|
|
import ui.controller.GlobalController;
|
|
|
import ui.model.Model;
|
|
|
|
|
@@ -19,32 +17,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();
|