diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-06-19 16:04:09 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-06-19 16:17:52 +0200 |
| commit | 633f09cda43e137387fcfd3279d6d1cd981dc24e (patch) | |
| tree | a4515f357e04f77b69c69534eaa2ed0a7a4c04fd | |
| parent | 49228cea2f058e9a56fc87c49d65ffcc292c54fa (diff) | |
| download | sonarqube-633f09cda43e137387fcfd3279d6d1cd981dc24e.tar.gz sonarqube-633f09cda43e137387fcfd3279d6d1cd981dc24e.zip | |
SONAR-5329 - Fixed activity Tests
| -rw-r--r-- | sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java | 11 | ||||
| -rw-r--r-- | sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java | 20 |
2 files changed, 25 insertions, 6 deletions
diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java index ffb530adf45..902c42542c7 100644 --- a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java @@ -127,14 +127,16 @@ public class ActivityServiceMediumTest { @Test public void filter_by_date() throws InterruptedException { - ActivityDto activity = ActivityDto.createFor(testValue) - .setType(Activity.Type.NONE).setAuthor("testing"); DateTime t0 = new DateTime().minusHours(1); + ActivityDto activity = getActivityDto(); activity.setCreatedAt(t0.toDate()); dao.insert(dbSession, activity); + activity = getActivityDto(); + activity.setCreatedAt(t0.toDate()); dao.insert(dbSession, activity); dbSession.commit(); DateTime t1 = new DateTime(); + activity = getActivityDto(); activity.setCreatedAt(t1.toDate()); dao.insert(dbSession, activity); dbSession.commit(); @@ -163,6 +165,11 @@ public class ActivityServiceMediumTest { new QueryOptions()).getHits()).hasSize(1); } + private ActivityDto getActivityDto() { + return ActivityDto.createFor(testValue) + .setType(Activity.Type.NONE).setAuthor("testing"); + } + @Test public void iterate_all() throws InterruptedException { int max = QueryOptions.DEFAULT_LIMIT + 3; diff --git a/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java b/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java index 57b371a3ea9..a8c767a6868 100644 --- a/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java +++ b/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java @@ -21,6 +21,7 @@ package org.sonar.server.activity.db; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -67,6 +68,17 @@ public class ActivityDaoTest extends AbstractDaoTestCase { } } + + @Test + public void fail_get_by_key() { + try { + dao.getByKey(session, "hello world"); + } catch (IllegalStateException e) { + assertThat(e.getMessage()).isEqualTo("Cannot execute getByKey on Activities in DB"); + } + } + + @Test public void fail_insert_missing_author() { String testValue = "hello world"; @@ -87,8 +99,8 @@ public class ActivityDaoTest extends AbstractDaoTestCase { .setAuthor("jUnit"); dao.insert(session, log); - assertThat(dao.findAll(session)).hasSize(1); - ActivityDto newDto = dao.getByKey(session, log.getKey()); + ActivityDto newDto = Iterables.getFirst(dao.findAll(session), null); + assertThat(newDto).isNotNull(); assertThat(newDto.getAuthor()).isEqualTo(log.getAuthor()); assertThat(newDto.getMessage()).isEqualTo(testValue); } @@ -114,8 +126,8 @@ public class ActivityDaoTest extends AbstractDaoTestCase { dao.insert(session, log); - assertThat(dao.findAll(session)).hasSize(1); - ActivityDto newDto = dao.getByKey(session, log.getKey()); + ActivityDto newDto = Iterables.getFirst(dao.findAll(session), null); + assertThat(newDto).isNotNull(); assertThat(newDto.getAuthor()).isEqualTo(log.getAuthor()); assertThat(newDto.getData()).isNotNull(); Map<String, String> details = KeyValueFormat.parse(newDto.getData()); |