Skip to content

Commit

Permalink
Remove user-specific configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
dmkeen committed Sep 28, 2023
1 parent 1c6dceb commit ef319c5
Showing 1 changed file with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

import static org.keen.solar.power.solcast.MeasurementSerializer.PERIOD_END_FORMAT;
import static org.mockito.Mockito.*;
Expand Down Expand Up @@ -91,7 +89,7 @@ public void givenSingleCurrentPower_whenUploadAll_thenMeasurementUploadedAndSave
.andExpect(jsonPath("$.measurement.period_end", Matchers.is(expectedPeriodEnd)))
.andExpect(jsonPath("$.measurement.period", Matchers.is(Duration.ofMinutes(5).toString())))
.andExpect(jsonPath("$.measurement.total_power", Matchers.is(generationWatts / 1000)))
.andRespond(withSuccess("{\"site_resource_id\":\"4f6d-b20d-5b0d-8032\",\"measurements\":[{\"period_end\":\""
.andRespond(withSuccess("{\"site_resource_id\":\"test-site-id\",\"measurements\":[{\"period_end\":\""
+ expectedPeriodEnd + "\",\"period\":\"PT5M\",\"total_power\":" + generationWatts / 1000 + "}]}", MediaType.APPLICATION_JSON));

// When
Expand Down Expand Up @@ -145,7 +143,7 @@ public void givenMultipleCurrentPower5MinsApart_whenUploadAll_thenMeasurementsUp
.andExpect(jsonPath("$.measurements[1].period_end", Matchers.is(expectedPeriodEndPlus5)))
.andExpect(jsonPath("$.measurements[1].period", Matchers.is(Duration.ofMinutes(5).toString())))
.andExpect(jsonPath("$.measurements[1].total_power", Matchers.is(generationWatts / 1000)))
.andRespond(withSuccess("{\"site_resource_id\":\"4f6d-b20d-5b0d-8032\",\"measurements\":[{\"period_end\":\""
.andRespond(withSuccess("{\"site_resource_id\":\"test-site-id\",\"measurements\":[{\"period_end\":\""
+ expectedPeriodEnd + "\",\"period\":\"PT5M\",\"total_power\":" + generationWatts / 1000 + "},"
+ "{\"period_end\":\"" + expectedPeriodEndPlus5 + "\",\"period\":\"PT5M\",\"total_power\":"
+ generationWatts / 1000 + "}]}", MediaType.APPLICATION_JSON));
Expand Down

0 comments on commit ef319c5

Please sign in to comment.