Some small refactoring
This commit is contained in:
parent
edaa23f0f6
commit
5716584772
15 changed files with 161 additions and 68 deletions
|
|
@ -20,17 +20,17 @@ public class EventControllerManagerTest {
|
|||
public void addAvailableEventDevice(){
|
||||
assertEquals(0, manager.getAvailableDeviceConfigs().size());
|
||||
|
||||
manager.addAvailableDevice(TestEvent1.class);
|
||||
manager.addAvailableDeviceConfig(TestEvent1.class);
|
||||
assertEquals(1, manager.getAvailableDeviceConfigs().size());
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestEvent1.class));
|
||||
|
||||
manager.addAvailableDevice(TestEvent2.class);
|
||||
manager.addAvailableDeviceConfig(TestEvent2.class);
|
||||
assertEquals(2, manager.getAvailableDeviceConfigs().size());
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestEvent1.class));
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestEvent2.class));
|
||||
|
||||
// Add duplicate Event
|
||||
manager.addAvailableDevice(TestEvent1.class);
|
||||
manager.addAvailableDeviceConfig(TestEvent1.class);
|
||||
assertEquals("No duplicate check",2, manager.getAvailableDeviceConfigs().size());
|
||||
}
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ public class EventControllerManagerTest {
|
|||
private Event registerEvent(HalEventConfig config){
|
||||
Event Event = new Event();
|
||||
Event.setDeviceConfig(config);
|
||||
manager.addAvailableDevice(config.getClass());
|
||||
manager.addAvailableDeviceConfig(config.getClass());
|
||||
manager.register(Event);
|
||||
return Event;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@ public class SensorControllerManagerTest {
|
|||
public void addAvailableDevice(){
|
||||
assertEquals(Collections.EMPTY_LIST, manager.getAvailableDeviceConfigs());
|
||||
|
||||
manager.addAvailableDevice(TestSensor1.class);
|
||||
manager.addAvailableDeviceConfig(TestSensor1.class);
|
||||
assertEquals(1, manager.getAvailableDeviceConfigs().size());
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestSensor1.class));
|
||||
|
||||
manager.addAvailableDevice(TestSensor2.class);
|
||||
manager.addAvailableDeviceConfig(TestSensor2.class);
|
||||
assertEquals(2, manager.getAvailableDeviceConfigs().size());
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestSensor1.class));
|
||||
assertTrue(manager.getAvailableDeviceConfigs().contains(TestSensor2.class));
|
||||
|
||||
// Add duplicate sensor
|
||||
manager.addAvailableDevice(TestSensor1.class);
|
||||
manager.addAvailableDeviceConfig(TestSensor1.class);
|
||||
assertEquals("No duplicate check",2, manager.getAvailableDeviceConfigs().size());
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ public class SensorControllerManagerTest {
|
|||
private Sensor registerSensor(HalSensorConfig config){
|
||||
Sensor sensor = new Sensor();
|
||||
sensor.setDeviceConfig(config);
|
||||
manager.addAvailableDevice(config.getClass());
|
||||
manager.addAvailableDeviceConfig(config.getClass());
|
||||
manager.register(sensor);
|
||||
return sensor;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue