mrtoth/cicaprojekt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tester.java fixed

Browse Source
This commit is contained in:
ericnerdo 2016-04-26 01:02:01 +02:00
parent 651069d762
commit 88f2c3103f
1 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cicaprojekt/Tester.java
View File

@ -198,11 +198,7 @@ public class Tester {
@Test @Test
boolean testScalesAndGates() throws IOException { boolean testScalesAndGates() throws IOException {
<<<<<<< HEAD
boolean succes = true;
=======
boolean success = true; boolean success = true;
>>>>>>> cica
loadMap("testScalesAndGates"); loadMap("testScalesAndGates");
boxLift("O"); boxLift("O");
@ -212,11 +208,7 @@ public class Tester {
String gateOpen = getConnectedGateOpen((Scale)oneill.getCurrentTile().getAdjacentTile(oneill.facingDirection)); String gateOpen = getConnectedGateOpen((Scale)oneill.getCurrentTile().getAdjacentTile(oneill.facingDirection));
if(!gateOpen.equals("gate open")) if(!gateOpen.equals("gate open"))
<<<<<<< HEAD
succes = false;
=======
success = false; success = false;
>>>>>>> cica
System.out.print("testScalesAndGates: "); System.out.print("testScalesAndGates: ");
if(success) if(success)
@ -291,15 +283,7 @@ public class Tester {
return results; return results;
} }
<<<<<<< HEAD
@Test
boolean rotationTest() {
String[] commands = {"loadMap rotationTest\n",
"Rotate O L\n",
"Rotate O R\n"};
=======
>>>>>>> cica
@Test @Test
boolean rotationTest() throws IOException { boolean rotationTest() throws IOException {
@ -314,28 +298,6 @@ public class Tester {
success = false; success = false;
System.out.print("rotationTest: "); System.out.print("rotationTest: ");
<<<<<<< HEAD
return true; //TODO check this
}
@Test
boolean testBoxes(){
boolean succes = true;
if(!boxLift("O").equals("box lifted"))
succes = false;
if(!boxDrop("O").equals("box dropped"))
succes = false;
System.out.print("testBoxes: ");
if(succes)
System.out.println("Sikeres!");
else System.out.println("Sikertelen!");
return succes;
=======
if(success) if(success)
System.out.println("Sikeres!"); System.out.println("Sikeres!");
else System.out.println("Sikertelen!"); else System.out.println("Sikertelen!");
@ -361,7 +323,6 @@ public class Tester {
else System.out.println("Sikertelen!"); else System.out.println("Sikertelen!");
return success; return success;
>>>>>>> cica
} }
private boolean testOnSequenceOfCommands(String[] commands, String[] expectedOutputs) { private boolean testOnSequenceOfCommands(String[] commands, String[] expectedOutputs) {