openstack
/
monasca-api
Code Issues Proposed changes

Make tests use UTC for dates.

This commit is contained in:
Deklan Dieterly 2014-07-09 14:33:47 -06:00
parent 652b87918d
commit cb7f29e1de
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -193,7 +193,17 @@
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>2.3.2</version>
</dependency>
</dependencies>
<build>

8
src/test/java/com/hpcloud/mon/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImplTest.java
View File

@ -5,6 +5,7 @@ import com.hpcloud.mon.infrastructure.persistence.influxdb.AlarmStateHistoryInfl
import org.influxdb.InfluxDB;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@ -48,10 +49,11 @@ public class AlarmStateHistoryInfluxDbRepositoryImplTest {
}
public void buildTimePartTest() {
String er = " and time > 1388559600s and time < 1388559601s";
String er = " and time > 1388534400s and time < 1388534401s";
String r =
this.alarmStateHistoryInfluxDBRepository.buildTimePart(new DateTime(2014, 01, 01, 0, 0, 0),
new DateTime(2014, 01, 01, 0, 0, 1));
this.alarmStateHistoryInfluxDBRepository.buildTimePart(new DateTime(2014, 01, 01, 0, 0,
0, DateTimeZone.UTC),
new DateTime(2014, 01, 01, 0, 0, 1, DateTimeZone.UTC));
assert (er.equals(r));
}

7
src/test/java/com/hpcloud/mon/infrastructure/persistence/influxdb/UtilsTest.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.testng.annotations.Test;
@Test
@ -29,9 +30,9 @@ public class UtilsTest {
}
public void whereClauseBuilderBuildTimePartTest() {
String expectedResult = " and time > 1388563261s and time < 1388563262s";
DateTime startTime = new DateTime(2014, 01, 01, 01, 01, 01);
DateTime endTime = new DateTime(2014, 01, 01, 01, 01, 02);
String expectedResult = " and time > 1388538061s and time < 1388538062s";
DateTime startTime = new DateTime(2014, 01, 01, 01, 01, 01, DateTimeZone.UTC);
DateTime endTime = new DateTime(2014, 01, 01, 01, 01, 02, DateTimeZone.UTC);
assert (expectedResult.equals(Utils.WhereClauseBuilder.buildTimePart(startTime, endTime)));
}