From 4ba4b225a6992fe7250e5e31c7980649a285646f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 3 Mar 2017 15:50:41 +0100 Subject: [PATCH] Remove useless db truncates in some ITs --- .../src/test/java/it/serverSystem/ServerSystemTest.java | 8 +------- it/it-tests/src/test/java/it/user/FavoritesWsTest.java | 1 - it/it-tests/src/test/java/it/user/MyAccountPageTest.java | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java index 3242a1ece0d..6e4ae6eadae 100644 --- a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java +++ b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java @@ -29,7 +29,6 @@ import okhttp3.Response; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.json.simple.JSONValue; -import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonarqube.ws.MediaTypes; @@ -54,16 +53,11 @@ public class ServerSystemTest { @ClassRule public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR; - @Before - public void cleanDatabase() { - orchestrator.resetData(); - } - @Test public void get_sonarqube_version() { Map json = callStatus(); - String version = (String)json.get("version"); + String version = (String) json.get("version"); if (!startsWithAny(version, new String[] {"6."})) { fail("Bad version: " + version); } diff --git a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java b/it/it-tests/src/test/java/it/user/FavoritesWsTest.java index adbc0454535..f161e53372d 100644 --- a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java +++ b/it/it-tests/src/test/java/it/user/FavoritesWsTest.java @@ -45,7 +45,6 @@ public class FavoritesWsTest { @Before public void inspectProject() { - orchestrator.resetData(); orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample"))); adminClient = newAdminWsClient(orchestrator); } diff --git a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java index 32b870a5a6a..5faccd0e466 100644 --- a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java +++ b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java @@ -47,7 +47,6 @@ public class MyAccountPageTest { @BeforeClass public static void setUp() { - orchestrator.resetData(); adminWsClient = newAdminWsClient(orchestrator); } -- 2.39.5