test: ota package refactored to get better output on assertion
This commit is contained in:
		
							parent
							
								
									c14bba5b1e
								
							
						
					
					
						commit
						0583880ec7
					
				@ -44,6 +44,7 @@ import java.util.ArrayList;
 | 
			
		||||
import java.util.Collections;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
 | 
			
		||||
import static org.assertj.core.api.Assertions.assertThat;
 | 
			
		||||
import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
 | 
			
		||||
 | 
			
		||||
public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
 | 
			
		||||
@ -58,7 +59,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
 | 
			
		||||
    private static final ByteBuffer DATA = ByteBuffer.wrap(new byte[]{(int) DATA_SIZE});
 | 
			
		||||
    private static final String URL = "http://firmware.test.org";
 | 
			
		||||
 | 
			
		||||
    private IdComparator<OtaPackageInfo> idComparator = new IdComparator<>();
 | 
			
		||||
    private final IdComparator<OtaPackageInfo> idComparator = new IdComparator<>();
 | 
			
		||||
 | 
			
		||||
    private TenantId tenantId;
 | 
			
		||||
 | 
			
		||||
@ -565,7 +566,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
 | 
			
		||||
        Collections.sort(firmwares, idComparator);
 | 
			
		||||
        Collections.sort(loadedFirmwares, idComparator);
 | 
			
		||||
 | 
			
		||||
        Assert.assertEquals(firmwares, loadedFirmwares);
 | 
			
		||||
        assertThat(firmwares).isEqualTo(loadedFirmwares);
 | 
			
		||||
 | 
			
		||||
        otaPackageService.deleteOtaPackagesByTenantId(tenantId);
 | 
			
		||||
 | 
			
		||||
@ -620,7 +621,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
 | 
			
		||||
        Collections.sort(firmwares, idComparator);
 | 
			
		||||
        Collections.sort(loadedFirmwares, idComparator);
 | 
			
		||||
 | 
			
		||||
        Assert.assertEquals(firmwares, loadedFirmwares);
 | 
			
		||||
        assertThat(firmwares).isEqualTo(loadedFirmwares);
 | 
			
		||||
 | 
			
		||||
        otaPackageService.deleteOtaPackagesByTenantId(tenantId);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user