From 788e9efeaf3284175b2d3e5079b9256d64239ac8 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 5 May 2017 10:11:51 +0200 Subject: [PATCH] Improve reliability of SupportPrivateProjectInDefaultPermissionTemplateTest There were some false-positives due to generated random values that are not unique. --- ...tPrivateProjectInDefaultPermissionTemplateTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java index ed06f61eb914..24fd17e1120b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java @@ -20,9 +20,9 @@ package org.sonar.server.platform.db.migration.version.v64; import java.sql.SQLException; -import java.util.Random; import java.util.stream.Stream; import javax.annotation.Nullable; +import org.apache.commons.lang.RandomStringUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -241,7 +241,7 @@ private void insertOrganization(String uuid, @Nullable Integer defaultGroupId, @ } private int insertGroup(String organizationUuid) { - String name = "name" + new Random().nextInt(122); + String name = "name" + RandomStringUtils.random(20); db.executeInsert( "GROUPS", "ORGANIZATION_UUID", organizationUuid, @@ -251,12 +251,12 @@ private int insertGroup(String organizationUuid) { } private IdAndUuid insertPermissionTemplate(String organizationUuid) { - int i = new Random().nextInt(1222); - String uuid = "ptUuid" + i; + String random = RandomStringUtils.random(20); + String uuid = "ptUuid" + random; db.executeInsert( "PERMISSION_TEMPLATES", "ORGANIZATION_UUID", organizationUuid, - "NAME", "name" + i, + "NAME", "name" + random, "KEE", uuid); return new IdAndUuid( ((Long) db.selectFirst("select id as \"ID\" from permission_templates where kee='" + uuid + "'").get("ID")).intValue(),