Skip to content
This repository has been archived by the owner on Oct 26, 2024. It is now read-only.

Commit

Permalink
Fixed failing build.
Browse files Browse the repository at this point in the history
  • Loading branch information
hirro committed May 11, 2014
1 parent 57679f1 commit 68e9e48
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,13 @@
<artifactId>json-path</artifactId>
<version>0.9.1</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
import com.arnellconsulting.tps.service.TpsService;
import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.startsWith;
import org.joda.time.DateTime;
import org.joda.time.LocalDateTime;
import static org.junit.Assert.assertThat;
Expand All @@ -40,9 +38,6 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -57,9 +52,6 @@
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
Expand Down Expand Up @@ -159,8 +151,8 @@ public void testList() throws Exception {

@Test
public void testListWithDefinedRange() throws Exception {
final DateTime fromDate = new DateTime(0);
final DateTime toDate = new DateTime(1);
final LocalDateTime fromDate = new LocalDateTime(0);
final LocalDateTime toDate = new LocalDateTime(1);
when(
tpsServiceMock.getTimeEntriesForPerson(
Mockito.anyLong(),
Expand Down

0 comments on commit 68e9e48

Please sign in to comment.