Merge remote-tracking branch 'origin/Strategy' into Strategy
This commit is contained in:
		
						commit
						0a57afc3c7
					
				| 
						 | 
					@ -275,7 +275,6 @@ public class Track implements TrackSpecification {
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public Config.SpaceType getSpaceType(PositionVector position) {
 | 
					    public Config.SpaceType getSpaceType(PositionVector position) {
 | 
				
			||||||
        //isPositionVectorOnTrack(position); Should be used but we are not allowed to change method head. We don't use function anyway
 | 
					 | 
				
			||||||
        char charAtPosition = track.get(position.getY()).charAt(position.getX());
 | 
					        char charAtPosition = track.get(position.getY()).charAt(position.getX());
 | 
				
			||||||
        ConfigSpecification.SpaceType[] spaceTypes = ConfigSpecification.SpaceType.values();
 | 
					        ConfigSpecification.SpaceType[] spaceTypes = ConfigSpecification.SpaceType.values();
 | 
				
			||||||
        for (ConfigSpecification.SpaceType spaceType : spaceTypes) {
 | 
					        for (ConfigSpecification.SpaceType spaceType : spaceTypes) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -133,7 +133,7 @@ class GameTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        @Test
 | 
					        @Test
 | 
				
			||||||
        void winner() {
 | 
					        void winner() {
 | 
				
			||||||
            game = new Game(new interFace("Test",new Integer[]{0,2,1},new PositionVector.Direction[]{RIGHT,
 | 
					            game = new Game(new interFace("Test",new Integer[]{0,2,0},new PositionVector.Direction[]{RIGHT,
 | 
				
			||||||
                RIGHT,
 | 
					                RIGHT,
 | 
				
			||||||
                RIGHT,
 | 
					                RIGHT,
 | 
				
			||||||
                NONE,
 | 
					                NONE,
 | 
				
			||||||
| 
						 | 
					@ -178,7 +178,7 @@ class GameTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        @Test
 | 
					        @Test
 | 
				
			||||||
        void crashA() {
 | 
					        void crashA() {
 | 
				
			||||||
            game = new Game(new interFace("Test",new Integer[]{0,2,2},new PositionVector.Direction[]{UP}));
 | 
					            game = new Game(new interFace("Test",new Integer[]{0,1,0},new PositionVector.Direction[]{UP}));
 | 
				
			||||||
            game.initPhase();
 | 
					            game.initPhase();
 | 
				
			||||||
            Assertions.assertEquals("b",game.gamePhase());
 | 
					            Assertions.assertEquals("b",game.gamePhase());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue