}
protected List execute(TimeMachineQuery query, boolean selectAllFields) {
- Resource resource = index.getResource(query.getResource());
+ Resource resource = query.getResource();
+ if (resource!=null && resource.getId()==null) {
+ resource = index.getResource(query.getResource());
+ }
if (resource == null) {
return Collections.emptyList();
}
setupData("loadMeasuresFromDate");
DefaultTimeMachine timeMachine = initTimeMachine();
- TimeMachineQuery query = new TimeMachineQuery(null).setFrom(date("2008-02-01")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
+ TimeMachineQuery query = new TimeMachineQuery(newProject()).setFrom(date("2008-02-01")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
List<Object[]> measures = timeMachine.getMeasuresFields(query);
assertThat(measures.size(), is(3));
private DefaultTimeMachine initTimeMachine() {
DefaultSonarIndex index = mock(DefaultSonarIndex.class);
- when(index.getResource((Resource) anyObject())).thenReturn(new Project("group:artifact").setId(1));
DefaultTimeMachine timeMachine = new DefaultTimeMachine(getSession(), index, new MeasuresDao(getSession()));
return timeMachine;
}
+ private Project newProject() {
+ Project project = new Project("group:artifact");
+ project.setId(1);
+ return project;
+ }
+
@Test(timeout = 3000)
public void loadMeasuresFromDate() throws ParseException {
setupData("loadMeasuresFromDate");
DefaultTimeMachine timeMachine = initTimeMachine();
- TimeMachineQuery query = new TimeMachineQuery(null).setFrom(date("2008-02-01")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
+ TimeMachineQuery query = new TimeMachineQuery(newProject()).setFrom(date("2008-02-01")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
List<Measure> measures = timeMachine.getMeasures(query);
assertThat(measures.size(), is(3));
DefaultTimeMachine timeMachine = initTimeMachine();
- TimeMachineQuery query = new TimeMachineQuery(null).setFrom(date("2008-01-01")).setTo(date("2008-12-25")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
+ TimeMachineQuery query = new TimeMachineQuery(newProject()).setFrom(date("2008-01-01")).setTo(date("2008-12-25")).setMetrics(Arrays.asList(CoreMetrics.NCLOC));
List<Measure> measures = timeMachine.getMeasures(query);
assertThat(measures.size(), is(1));
assertThat(measures.get(0).getValue(), is(200d));