diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-06-19 17:19:33 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-06-19 17:19:42 +0200 |
| commit | 1986d617e0424fb4abd6510d330755cf33e04ed0 (patch) | |
| tree | 51e1a3c4e25a3b1452ea4afe793c47815430d63e | |
| parent | ebd12183ad445d00da3807bf2b2fd3866fd96a44 (diff) | |
| download | sonarqube-1986d617e0424fb4abd6510d330755cf33e04ed0.tar.gz sonarqube-1986d617e0424fb4abd6510d330755cf33e04ed0.zip | |
SONAR-5329 - Added medium test for QProfile#findActivity
3 files changed, 10 insertions, 4 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java index 86d99db4d43..dc3852dccc9 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java @@ -21,6 +21,7 @@ package org.sonar.server.qualityprofile; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.OrFilterBuilder; import org.elasticsearch.search.SearchHit; @@ -66,7 +67,7 @@ public class QProfileService implements ServerComponent { private final QProfileReset reset; public QProfileService(DbClient db, IndexClient index, RuleActivator ruleActivator, QProfileFactory factory, QProfileBackuper backuper, - QProfileCopier copier, QProfileReset reset) { + QProfileCopier copier, QProfileReset reset) { this.db = db; this.index = index; this.ruleActivator = ruleActivator; @@ -255,9 +256,10 @@ public class QProfileService implements ServerComponent { activityFilter.add(FilterBuilders.termFilter("details.profileKey", profileKey)); } - for (SearchHit hit : - index.get(ActivityIndex.class).search(query, options, activityFilter).getHits().getHits()) { + SearchResponse response = index.get(ActivityIndex.class).search(query, options, activityFilter); + for (SearchHit hit : response.getHits().getHits()) { QProfileActivity profileActivity = new QProfileActivity(hit.getSource()); + results.add(profileActivity); } return results; } 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 a317418eadf..0e48a154e3f 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 @@ -146,6 +146,9 @@ public class ActivityServiceMediumTest { DateTime t2 = new DateTime().plusHours(1); + assertThat(service.search(new ActivityQuery(), + new QueryOptions()).getHits()).hasSize(3); + assertThat(service.search(new ActivityQuery() .setSince(t0.minusSeconds(5).toDate()), new QueryOptions()).getHits()).hasSize(3); diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java index 0147da5d6da..27ea1cf0995 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java @@ -151,10 +151,11 @@ public class QProfileServiceMediumTest { } @Test - public void search_qprofile_activity() { + public void search_qprofile_activity() throws InterruptedException { tester.get(ActivityService.class).write(dbSession, Activity.Type.QPROFILE, "hello world"); tester.get(ActivityService.class).write(dbSession, Activity.Type.QPROFILE, "hello world"); tester.get(ActivityService.class).write(dbSession, Activity.Type.QPROFILE, "hello world"); + dbSession.commit(); List<QProfileActivity> activities = service.findActivities(new QProfileActivityQuery(), new QueryOptions()); assertThat(activities).hasSize(3); |