diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-03-18 12:08:53 +0100 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-03-18 12:08:53 +0100 |
| commit | af36f335155b2ed4d3a3579938b766263b7d7c3a (patch) | |
| tree | 490203626d1488b89f9e92c461125441dc1af3de /sonar-server/src/test | |
| parent | 2745e3dbba4f62a0c11aeb9b1c4f05321636c3dd (diff) | |
| download | sonarqube-af36f335155b2ed4d3a3579938b766263b7d7c3a.tar.gz sonarqube-af36f335155b2ed4d3a3579938b766263b7d7c3a.zip | |
SONAR-2289 Increase timeouts of embedded database startup/shutdown
Diffstat (limited to 'sonar-server/src/test')
| -rw-r--r-- | sonar-server/src/test/java/org/sonar/server/database/EmbeddedDatabaseTest.java | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sonar-server/src/test/java/org/sonar/server/database/EmbeddedDatabaseTest.java b/sonar-server/src/test/java/org/sonar/server/database/EmbeddedDatabaseTest.java index b58d1b6c1cc..a75dd1fca40 100644 --- a/sonar-server/src/test/java/org/sonar/server/database/EmbeddedDatabaseTest.java +++ b/sonar-server/src/test/java/org/sonar/server/database/EmbeddedDatabaseTest.java @@ -19,10 +19,12 @@ */ package org.sonar.server.database; -import junit.framework.TestCase; import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.io.FileUtils; import org.apache.derby.jdbc.ClientDriver; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -31,7 +33,10 @@ import java.sql.Connection; import java.sql.DriverManager; import java.util.Properties; -public class EmbeddedDatabaseTest extends TestCase { +import static junit.framework.Assert.fail; +import static org.junit.Assert.assertTrue; + +public class EmbeddedDatabaseTest { private final static String TEST_ROOT_DIR = "./target/"; private final static String TEST_DB_DIR_PREFIX = "testDB"; @@ -41,8 +46,8 @@ public class EmbeddedDatabaseTest extends TestCase { private Properties defaultProps; private static String testPort; - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { windowsCleanup(); if (testPort == null) { testPort = Integer.toString(findFreeServerPort()); @@ -77,11 +82,12 @@ public class EmbeddedDatabaseTest extends TestCase { return port; } - public void testStart() throws Exception { + @Test + public void shouldStart() throws Exception { database = new EmbeddedDatabase(new File(TEST_ROOT_DIR + TEST_DB_DIR_PREFIX + "Start" + testPort), defaultProps); database.start(); ClientDriver.class.newInstance(); - Connection conn = null; + Connection conn; try { conn = DriverManager.getConnection(driverUrl); conn.close(); @@ -102,11 +108,12 @@ public class EmbeddedDatabaseTest extends TestCase { database.stop(); } - public void testStop() throws Exception { + @Test + public void shouldStop() throws Exception { database = new EmbeddedDatabase(new File(TEST_ROOT_DIR + TEST_DB_DIR_PREFIX + "Stop" + testPort), defaultProps); database.start(); ClientDriver.class.newInstance(); - Connection conn = null; + Connection conn; try { conn = DriverManager.getConnection(driverUrl); conn.close(); @@ -123,7 +130,7 @@ public class EmbeddedDatabaseTest extends TestCase { } } - @Override + @After public void tearDown() throws IOException { if (database.getDataDir().exists()) { String os = System.getProperty("os.name"); |