aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/sonar-dbcleaner-plugin
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2011-10-28 12:23:19 +0400
committerEvgeny Mandrikov <mandrikov@gmail.com>2011-10-31 20:18:21 +0400
commit6e9ec5e893b586d1e7e92d00c30d5a2111ef5e05 (patch)
tree26c1332e7dbe8d2ec952b9f821588667d77ca1f5 /plugins/sonar-dbcleaner-plugin
parent862ef49b779d110ceae531cfe3cf42b6038601ff (diff)
downloadsonarqube-6e9ec5e893b586d1e7e92d00c30d5a2111ef5e05.tar.gz
sonarqube-6e9ec5e893b586d1e7e92d00c30d5a2111ef5e05.zip
SONAR-2956 Support Boolean type with Derby
- Change DDL to use BOOLEAN instead of SMALLINT - Modify Hibernate dialect - Modify activerecord-jdbc-adapter (ideas were taken from arjdbc/postgresql/adapter.rb) - Use Derby for unit tests instead of HSQL and fix incorrect tests
Diffstat (limited to 'plugins/sonar-dbcleaner-plugin')
-rw-r--r--plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleanerTest.java21
-rw-r--r--plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResourcesTest.java3
2 files changed, 15 insertions, 9 deletions
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleanerTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleanerTest.java
index 0d561db86e2..bbd1c0a78b4 100644
--- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleanerTest.java
+++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/period/DefaultPeriodCleanerTest.java
@@ -32,16 +32,14 @@ public class DefaultPeriodCleanerTest extends AbstractDbUnitTestCase {
DefaultPeriodCleaner cleaner;
+ Project project;
+ Periods periods;
+
@Before
public void init() {
cleaner = new DefaultPeriodCleaner(getSession());
- }
-
- @Test
- public void integrationTests() {
- setupData("dbContent");
- Project project = new Project("myproject");
+ project = new Project("myproject");
project.setConfiguration(new PropertiesConfiguration());
GregorianCalendar calendar = new GregorianCalendar(2010, 10, 1);
@@ -50,12 +48,19 @@ public class DefaultPeriodCleanerTest extends AbstractDbUnitTestCase {
Date dateToStartKeepingOneSnapshotByMonth = calendar.getTime();
calendar.set(2010, 2, 1);
Date dateToStartDeletingAllSnapshots = calendar.getTime();
- Periods periods = new Periods(dateToStartKeepingOneSnapshotByWeek, dateToStartKeepingOneSnapshotByMonth, dateToStartDeletingAllSnapshots);
+ periods = new Periods(dateToStartKeepingOneSnapshotByWeek, dateToStartKeepingOneSnapshotByMonth, dateToStartDeletingAllSnapshots);
+ }
+ @Test
+ public void integrationTests() {
+ setupData("dbContent");
cleaner.purge(project, 1010, periods);
checkTables("dbContent", "snapshots");
+ }
- //After a first run, no more snapshot should be deleted
+ @Test
+ public void test() {
+ // After a first run, no more snapshot should be deleted
setupData("dbContent-result");
cleaner.purge(project, 1010, periods);
checkTables("dbContent");
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResourcesTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResourcesTest.java
index 4bde0b19c87..a912f142b6a 100644
--- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResourcesTest.java
+++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDeletedResourcesTest.java
@@ -32,7 +32,8 @@ public class PurgeDeletedResourcesTest extends AbstractDbUnitTestCase {
setupData("sharedFixture", "purgeDeletedResources");
final Connection c = getConnection().getConnection();
- c.prepareStatement("SET REFERENTIAL_INTEGRITY FALSE; ").execute();
+ // TODO Godin: next line was here with HSQL
+ //c.prepareStatement("SET REFERENTIAL_INTEGRITY FALSE; ").execute();
c.prepareStatement("delete from projects where id=3").executeUpdate();
c.commit();