smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sensor

Browse source
This commit is contained in:
omenem 2020-05-26 18:13:42 +02:00
parent 1aab50c9f8
commit 3e2eb231a0
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
View file

@ -44,8 +44,6 @@ public class SensorController {
newSensor.setName(s.getName());
newSensor.setRoomId(s.getRoomId());
newSensor.setValue(s.getValue());
// newSensor.setError(s.getError());
// newSensor.setTypical(s.getTypical());
return deviceService.saveAsOwner(newSensor, principal.getName());
}

21
src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
View file

@ -108,4 +108,25 @@ public class SensorControllerTests {
assertThat(sensorController.updateValue(1L, BigDecimal.valueOf(30), mockPrincipal))
.isSameAs(s);
}
@Test
public void testUpdateSimulation() throws NotFoundException {
final Sensor s = new Sensor();
when(sensorRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(s));
when(sensorRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
when(sensorService.updateSimulationFromSensor(
s, BigDecimal.valueOf(30), BigDecimal.valueOf(10)))
.thenAnswer(
i -> {
s.setError(i.getArgument(1));
s.setTypical(i.getArgument(2));
return s;
});
assertThatThrownBy(() -> sensorController.updateValue(2L, BigDecimal.ZERO, mockPrincipal))
.isInstanceOf(NotFoundException.class);
assertThat(
sensorController.updateSimulation(
1L, BigDecimal.valueOf(30), BigDecimal.valueOf(10), mockPrincipal))
.isSameAs(s);
}
}