Commit 3c4c7ebd06cb83b1af0f9ce17432a266d49d8581
1 parent
f6c72051
Correct generating of random string with fixed length
Showing
1 changed file
with
26 additions
and
13 deletions
@@ -41,6 +41,7 @@ import java.nio.ByteBuffer; | @@ -41,6 +41,7 @@ import java.nio.ByteBuffer; | ||
41 | import java.util.ArrayList; | 41 | import java.util.ArrayList; |
42 | import java.util.Collections; | 42 | import java.util.Collections; |
43 | import java.util.List; | 43 | import java.util.List; |
44 | +import java.util.Random; | ||
44 | 45 | ||
45 | import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; | 46 | import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; |
46 | 47 | ||
@@ -662,16 +663,11 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | @@ -662,16 +663,11 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | ||
662 | } | 663 | } |
663 | 664 | ||
664 | @Test | 665 | @Test |
665 | - public void testSaveOtaPackageCantViolateSizeOfTitleAndVersion() { | 666 | + public void testSaveOtaPackageCantViolateSizeOfTitle() { |
666 | OtaPackageInfo firmwareInfo = new OtaPackageInfo(); | 667 | OtaPackageInfo firmwareInfo = new OtaPackageInfo(); |
667 | firmwareInfo.setDeviceProfileId(deviceProfileId); | 668 | firmwareInfo.setDeviceProfileId(deviceProfileId); |
668 | firmwareInfo.setType(FIRMWARE); | 669 | firmwareInfo.setType(FIRMWARE); |
669 | - firmwareInfo.setTitle("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
670 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
671 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
672 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
673 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
674 | - "aaaaaaaaaa"); | 670 | + firmwareInfo.setTitle(randomStringByLength(257)); |
675 | firmwareInfo.setVersion(VERSION); | 671 | firmwareInfo.setVersion(VERSION); |
676 | firmwareInfo.setUrl(URL); | 672 | firmwareInfo.setUrl(URL); |
677 | firmwareInfo.setTenantId(tenantId); | 673 | firmwareInfo.setTenantId(tenantId); |
@@ -680,14 +676,18 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | @@ -680,14 +676,18 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | ||
680 | thrown.expectMessage("The length of title should be equal or shorter than 255"); | 676 | thrown.expectMessage("The length of title should be equal or shorter than 255"); |
681 | 677 | ||
682 | otaPackageService.saveOtaPackageInfo(firmwareInfo, true); | 678 | otaPackageService.saveOtaPackageInfo(firmwareInfo, true); |
679 | + } | ||
683 | 680 | ||
681 | + @Test | ||
682 | + public void testSaveOtaPackageCantViolateSizeOfVersion() { | ||
683 | + OtaPackageInfo firmwareInfo = new OtaPackageInfo(); | ||
684 | + firmwareInfo.setDeviceProfileId(deviceProfileId); | ||
685 | + firmwareInfo.setType(FIRMWARE); | ||
686 | + firmwareInfo.setUrl(URL); | ||
687 | + firmwareInfo.setTenantId(tenantId); | ||
684 | firmwareInfo.setTitle(TITLE); | 688 | firmwareInfo.setTitle(TITLE); |
685 | - firmwareInfo.setVersion("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
686 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
687 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
688 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
689 | - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + | ||
690 | - "aaaaaaaaaa"); | 689 | + |
690 | + firmwareInfo.setVersion(randomStringByLength(257)); | ||
691 | thrown.expectMessage("The length of version should be equal or shorter than 255"); | 691 | thrown.expectMessage("The length of version should be equal or shorter than 255"); |
692 | 692 | ||
693 | otaPackageService.saveOtaPackageInfo(firmwareInfo, true); | 693 | otaPackageService.saveOtaPackageInfo(firmwareInfo, true); |
@@ -709,4 +709,17 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | @@ -709,4 +709,17 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { | ||
709 | return otaPackageService.saveOtaPackage(firmware); | 709 | return otaPackageService.saveOtaPackage(firmware); |
710 | } | 710 | } |
711 | 711 | ||
712 | + private String randomStringByLength(int length) { | ||
713 | + int leftLimit = 97; | ||
714 | + int rightLimit = 122; | ||
715 | + Random random = new Random(); | ||
716 | + StringBuilder buffer = new StringBuilder(length); | ||
717 | + for (int i = 0; i < length; i++) { | ||
718 | + int randomLimitedInt = leftLimit + (int) | ||
719 | + (random.nextFloat() * (rightLimit - leftLimit + 1)); | ||
720 | + buffer.append((char) randomLimitedInt); | ||
721 | + } | ||
722 | + return buffer.toString(); | ||
723 | + } | ||
724 | + | ||
712 | } | 725 | } |