Replace java.util.Uuid by org.sonar.api.utils.Uuids in tests

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
index e89cf357a6aa57cc28c7059382340bdafdad4929..8b79c9086f2128937875d387c26d68a6d2317eae 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
@@ -22,15 +22,14 @@ package org.sonar.server.component;
 
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Scopes;
+import org.sonar.api.utils.internal.Uuids;
 import org.sonar.core.component.ComponentDto;
 
-import java.util.UUID;
-
 public class ComponentTesting {
 
   public static ComponentDto newFileDto(ComponentDto subProjectOrProject) {
     return new ComponentDto()
-      .setUuid(UUID.randomUUID().toString())
+      .setUuid(Uuids.create())
       .setProjectUuid(subProjectOrProject.projectUuid())
       .setModuleUuid(subProjectOrProject.uuid())
       .setModuleUuidPath(subProjectOrProject.moduleUuidPath() == null ? subProjectOrProject.uuid() : subProjectOrProject.moduleUuidPath() + "." + subProjectOrProject.uuid())
@@ -47,7 +46,7 @@ public class ComponentTesting {
 
   public static ComponentDto newModuleDto(ComponentDto subProjectOrProject) {
     return new ComponentDto()
-      .setUuid(UUID.randomUUID().toString())
+      .setUuid(Uuids.create())
       .setProjectUuid(subProjectOrProject.projectUuid())
       .setModuleUuid(subProjectOrProject.uuid())
       .setModuleUuidPath(subProjectOrProject.moduleUuidPath() == null ? subProjectOrProject.uuid() : subProjectOrProject.moduleUuidPath() + "." + subProjectOrProject.uuid())
@@ -63,7 +62,7 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newProjectDto() {
-    String uuid = UUID.randomUUID().toString();
+    String uuid = Uuids.create();
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(uuid)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
index c4b354193b7f0c208b532f643a1475ebfe936018..a519fb49ee50899c2ac27543a4003b2c7fd329b0 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
@@ -25,6 +25,7 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.api.utils.System2;
+import org.sonar.api.utils.internal.Uuids;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.persistence.TestDatabase;
@@ -33,7 +34,6 @@ import org.sonar.server.db.fake.FakeDto;
 import org.sonar.server.db.fake.FakeMapper;
 
 import java.util.Date;
-import java.util.UUID;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -78,7 +78,7 @@ public class BaseDaoTest {
   public void can_insert_and_select_by_key() throws Exception {
     long t0 = System.currentTimeMillis() - 1000;
 
-    String key = UUID.randomUUID().toString();
+    String key = Uuids.create();
     FakeDto myDto = new FakeDto()
       .setKey(key);
     dao.insert(session, myDto);
@@ -98,7 +98,7 @@ public class BaseDaoTest {
   @Test
   public void does_enqueue_on_insert() {
     FakeDto myDto = new FakeDto()
-      .setKey(UUID.randomUUID().toString());
+      .setKey(Uuids.create());
     dao.insert(session, myDto);
     session.commit();
     assertThat(session.getActionCount()).isEqualTo(1);
@@ -108,7 +108,7 @@ public class BaseDaoTest {
   public void synchronize_to_es_after_date() throws Exception {
     long t0 = System.currentTimeMillis() - 1000;
 
-    String key = UUID.randomUUID().toString();
+    String key = Uuids.create();
     FakeDto myDto = new FakeDto()
       .setKey(key);
     dao.insert(session, myDto);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
index dc1eed20ebc188dbeb913a57e5cd6a3a2a91ac91..be19b18af402b4e1c243add63afb9a0c2ef907bf 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
@@ -24,13 +24,12 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.KeyValueFormat;
+import org.sonar.api.utils.internal.Uuids;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.core.issue.db.IssueDto;
 import org.sonar.core.rule.RuleDto;
 import org.sonar.server.issue.index.IssueDoc;
 
-import java.util.UUID;
-
 import static org.fest.assertions.Assertions.assertThat;
 
 public class IssueTesting {
@@ -45,7 +44,7 @@ public class IssueTesting {
    */
   public static IssueDto newDto(RuleDto rule, ComponentDto file, ComponentDto project) {
     return new IssueDto()
-      .setKee(UUID.randomUUID().toString())
+      .setKee(Uuids.create())
       .setRule(rule)
       .setComponent(file)
       .setProject(project)