fixed tests
This commit is contained in:
parent
ecb2efdabd
commit
1c22a4b35a
@ -59,7 +59,6 @@ import org.thingsboard.server.dao.relation.RelationService;
|
|||||||
import org.thingsboard.server.dao.resource.ResourceService;
|
import org.thingsboard.server.dao.resource.ResourceService;
|
||||||
import org.thingsboard.server.dao.rule.RuleChainService;
|
import org.thingsboard.server.dao.rule.RuleChainService;
|
||||||
import org.thingsboard.server.dao.settings.AdminSettingsService;
|
import org.thingsboard.server.dao.settings.AdminSettingsService;
|
||||||
import org.thingsboard.server.dao.tenant.DefaultTbTenantProfileCache;
|
|
||||||
import org.thingsboard.server.dao.tenant.TenantProfileService;
|
import org.thingsboard.server.dao.tenant.TenantProfileService;
|
||||||
import org.thingsboard.server.dao.tenant.TenantService;
|
import org.thingsboard.server.dao.tenant.TenantService;
|
||||||
import org.thingsboard.server.dao.timeseries.TimeseriesService;
|
import org.thingsboard.server.dao.timeseries.TimeseriesService;
|
||||||
@ -162,9 +161,6 @@ public abstract class AbstractServiceTest {
|
|||||||
@Autowired
|
@Autowired
|
||||||
protected OtaPackageService otaPackageService;
|
protected OtaPackageService otaPackageService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
protected DefaultTbTenantProfileCache tenantProfileCache;
|
|
||||||
|
|
||||||
public class IdComparator<D extends HasId> implements Comparator<D> {
|
public class IdComparator<D extends HasId> implements Comparator<D> {
|
||||||
@Override
|
@Override
|
||||||
public int compare(D o1, D o2) {
|
public int compare(D o1, D o2) {
|
||||||
|
|||||||
@ -109,6 +109,7 @@ public class BaseDeviceProfileServiceTest extends AbstractServiceTest {
|
|||||||
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
||||||
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
||||||
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
||||||
|
firmware.setDataSize(1L);
|
||||||
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
||||||
|
|
||||||
deviceProfile.setFirmwareId(savedFirmware.getId());
|
deviceProfile.setFirmwareId(savedFirmware.getId());
|
||||||
|
|||||||
@ -200,6 +200,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
|
|||||||
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
||||||
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
||||||
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
||||||
|
firmware.setDataSize(1L);
|
||||||
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
||||||
|
|
||||||
savedDevice.setFirmwareId(savedFirmware.getId());
|
savedDevice.setFirmwareId(savedFirmware.getId());
|
||||||
@ -234,6 +235,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
|
|||||||
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
firmware.setChecksumAlgorithm(ChecksumAlgorithm.SHA256);
|
||||||
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
firmware.setChecksum("4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a");
|
||||||
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
firmware.setData(ByteBuffer.wrap(new byte[]{1}));
|
||||||
|
firmware.setDataSize(1L);
|
||||||
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
OtaPackage savedFirmware = otaPackageService.saveOtaPackage(firmware);
|
||||||
|
|
||||||
savedDevice.setFirmwareId(savedFirmware.getId());
|
savedDevice.setFirmwareId(savedFirmware.getId());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user