Merge pull request #4 from szfp98/nandi

Nandi

train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java

@@ -2,10 +2,16 @@
 
 public interface TrainUser {
 
+	boolean alarmState = false;
+
 	int getJoystickPosition();
 
 	boolean getAlarmFlag();
 
 	void overrideJoystickPosition(int joystickPosition);
 
+	public boolean getAlarmState();
+
+	public void setAlarmState(boolean alarmState);
+
 }

train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java

@@ -24,6 +24,10 @@ public int getSpeedLimit() {
 	public void overrideSpeedLimit(int speedLimit) {
 		this.speedLimit = speedLimit;
 		controller.setSpeedLimit(speedLimit);
+
+		if(speedLimit < 0 || speedLimit > 500 || speedLimit < controller.getReferenceSpeed() / 2) {
+			user.setAlarmState(true);
+		}
 	}
 
 }

train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java

@@ -1,11 +1,47 @@
 package hu.bme.mit.train.sensor;
 
+import TrainController;
+import TrainSensorImpl;
+import TrainUser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
 
     public class TrainSensorTest {
 
-
+    TrainController mockTC;
+    TrainUser mockTU;
+    TrainsSensorImpl trainSensor;
+
+    @Before
+    public void before() {
+        mockTC = mock(TrainController.class);
+        mockTU = mock(TrainUser.class);
+        trainSensor = new TrainSensorImpl(mockTC, mockTU);
+    }
+
+    @Test
+    public void setAlarmState_TrainUser_Min() {
+        trainSensor.overrideSpeedLimit(-1);
+        verify(mockTU, times(1)).setAlarmState(true);
+    }
+
+    @Test
+    public void setAlarmState_TrainUser_Max() {
+        trainSensor.overrideSpeedLimit(501);
+        verify(mockTU, times(1)).setAlarmState(true);
+    }
+
+    @Test
+    public void setAlarmState_TrainUser_RelativeLimit() {
+        trainSensor.overrideSpeedLimit(3);
+        verify(mockTU, times(1)).setAlarmState(true);
+    }
+
+    @Test
+    public void setAlarmState_TrainUser_Between() {
+        trainSensor.overrideSpeedLimit(300);
+        verify(mockTU, times(0)).setAlarmState(false);
+    }
 }

train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java

@@ -30,4 +30,15 @@ public void overrideJoystickPosition(int joystickPosition) {
 		controller.followSpeed();
 	}
 
+	@Override
+	public boolean getAlarmState() {
+		return alarmState;
+	}
+
+	public void setAlarmState(boolean alarmState) {
+		alarmState = alarmState;
+	}
+
+
+
 }