Migrate to latest Play version - addresses #92

Fixes failing tests.
resamsel · Nov 9, 2020 · 79ccf8d · 79ccf8d
1 parent 1e69072
commit 79ccf8d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 39 deletions.
diff --git a/app/criterias/HasNextPagedList.java b/app/criterias/HasNextPagedList.java
@@ -113,7 +113,7 @@ public int getPageSize() {
 
   @Override
   public int getPageIndex() {
-    return getOffset() / getPageSize();
+    return getPageSize() != 0 ? getOffset() / getPageSize() : 0;
   }
 
   public int getOffset() {

diff --git a/src/it/java/controllers/ApiControllerTest.java b/src/it/java/controllers/ApiControllerTest.java
@@ -3,26 +3,27 @@
 import org.apache.http.client.utils.URIBuilder;
 import play.mvc.Call;
 import play.mvc.Http.RequestBuilder;
+import tests.AbstractTest;
 
 import java.net.URISyntaxException;
 
 import static assertions.CustomAssertions.assertThat;
 import static play.test.Helpers.route;
 
-abstract class ApiControllerTest extends ControllerTest {
+abstract class ApiControllerTest extends AbstractTest {
 
   void assertAccessDenied(Call call, String accessToken, String description) {
     try {
       assertThat(route(
-          app,
-          new RequestBuilder().uri(
-              new URIBuilder(call.url())
-                  .addParameter("access_token", accessToken)
-                  .build()
-          )
+              app,
+              new RequestBuilder().uri(
+                      new URIBuilder(call.url())
+                              .addParameter("access_token", accessToken)
+                              .build()
+              )
       ))
-          .as(description)
-          .statusIsEqualTo(Projects.FORBIDDEN);
+              .as(description)
+              .statusIsEqualTo(403);
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException(e);
     }

diff --git a/src/it/java/controllers/ControllerTest.java b/src/it/java/controllers/ControllerTest.java
diff --git a/src/test/java/importers/JsonImporterTest.java b/src/test/java/importers/JsonImporterTest.java
@@ -1,6 +1,5 @@
 package importers;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
 import models.Locale;
 import org.junit.Before;
 import org.junit.Test;
@@ -15,7 +14,6 @@
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
 
 @RunWith(MockitoJUnitRunner.class)
 public class JsonImporterTest {
@@ -33,18 +31,16 @@ public void setUp() {
   }
 
   @Test
-  public void retrievePropertiesWithNoJsonObject() {
+  public void retrievePropertiesWithNoJsonObject() throws Exception {
     // given
     InputStream inputStream = new ByteArrayInputStream("".getBytes());
     Locale locale = new Locale();
 
     // when
-    Throwable thrown = catchThrowable(() -> target.retrieveProperties(inputStream, locale));
+    Properties actual = target.retrieveProperties(inputStream, locale);
 
     // then
-    assertThat(thrown)
-        .isInstanceOf(JsonMappingException.class)
-        .hasMessageContaining("end-of-input");
+    assertThat(actual).isEmpty();
   }
 
   @Test

diff --git a/src/test/java/repositories/impl/ProjectUserRepositoryImplTest.java b/src/test/java/repositories/impl/ProjectUserRepositoryImplTest.java
@@ -59,6 +59,7 @@ public class ProjectUserRepositoryImplTest {
 
   @Before
   public void setUp() {
+    when(persistence.find(eq(ProjectUser.class))).thenReturn(query);
     when(query.where()).thenReturn(where);
     when(where.idEq(any())).thenReturn(expressionList);
     when(where.query()).thenReturn(query);