Merge
This commit is contained in:
		
							parent
							
								
									ae35b45799
								
							
						
					
					
						commit
						863b7a72ed
					
				@ -1078,7 +1078,6 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
 | 
				
			|||||||
        return loadedCustomerUsers;
 | 
					        return loadedCustomerUsers;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    private Alarm createTestAlarm(Device device) {
 | 
					    private Alarm createTestAlarm(Device device) {
 | 
				
			||||||
        Alarm alarm = new Alarm();
 | 
					        Alarm alarm = new Alarm();
 | 
				
			||||||
        alarm.setOriginator(device.getId());
 | 
					        alarm.setOriginator(device.getId());
 | 
				
			||||||
@ -1087,6 +1086,7 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
 | 
				
			|||||||
        alarm.setType("testAlarm");
 | 
					        alarm.setType("testAlarm");
 | 
				
			||||||
        alarm.setStartTs(System.currentTimeMillis());
 | 
					        alarm.setStartTs(System.currentTimeMillis());
 | 
				
			||||||
        return doPost("/api/alarm", alarm, Alarm.class);
 | 
					        return doPost("/api/alarm", alarm, Alarm.class);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Test
 | 
					    @Test
 | 
				
			||||||
    public void testEmptyDashboardSettings() throws Exception {
 | 
					    public void testEmptyDashboardSettings() throws Exception {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user