generate random test data with covered file each time

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
index 30383b7d39d637e3deb5423c750de09ca638debd..1d6e7ce5628e824953de043956a446b8f7ec4314 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
@@ -57,6 +57,7 @@ public class IndexTestsStepTest extends BaseStepTest {
   @Before
   public void setUp() {
     dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new FileSourceDao(null));
+    esTester.truncateIndices();
   }
 
   @Override
@@ -72,7 +73,7 @@ public class IndexTestsStepTest extends BaseStepTest {
   }
 
   @Test
-  public void index_source() throws Exception {
+  public void index_test() throws Exception {
     dbTester.prepareDbUnit(getClass(), "index_source.xml");
     Connection connection = dbTester.openConnection();
     TestTesting.updateDataColumn(connection, "FILE1_UUID", TestTesting.newRandomTests(1));

diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java
index 9a451e4fd0e80f414f95a6e498710dfeaa12ade2..a9bb19c7bec9a759665b60f45120d625d21a9518 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java
@@ -65,8 +65,7 @@ public class TestTesting {
         .setStacktrace(RandomStringUtils.randomAlphanumeric(50))
         .setMsg(RandomStringUtils.randomAlphanumeric(30))
         .setExecutionTimeMs(RandomUtils.nextLong());
-      int numberOfCoveredFiles = RandomUtils.nextInt(10);
-      for (int j = 0; j < numberOfCoveredFiles; j++) {
+      for (int j = 0; j < numberOfTests; j++) {
         test.addCoveredFile(
           FileSourceDb.Test.CoveredFile.newBuilder()
             .setFileUuid(Uuids.create())