JAVA-15609 Fixed failing tests (#13304)
This commit is contained in:
committed by
GitHub
parent
4f5cd325a6
commit
d4dcbf1126
@@ -7,11 +7,11 @@ import org.doctester.testbrowser.Response;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import ninja.NinjaDocTester;
|
import ninja.NinjaDocTester;
|
||||||
|
|
||||||
public class ApiControllerDocTesterIntegrationTest extends NinjaDocTester {
|
public class ApiControllerDocTesterUnitTest extends NinjaDocTester {
|
||||||
|
|
||||||
String URL_INDEX = "/";
|
String URL_INDEX = "/";
|
||||||
String URL_HELLO = "/hello";
|
String URL_HELLO = "/hello";
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetIndex() {
|
public void testGetIndex() {
|
||||||
Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_INDEX)));
|
Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_INDEX)));
|
||||||
@@ -23,5 +23,5 @@ public class ApiControllerDocTesterIntegrationTest extends NinjaDocTester {
|
|||||||
Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_HELLO)));
|
Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_HELLO)));
|
||||||
assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
|
assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,23 +1,23 @@
|
|||||||
package controllers;
|
package controllers;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import javax.inject.Inject;
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import ninja.NinjaRunner;
|
import ninja.NinjaTest;
|
||||||
import ninja.Result;
|
import ninja.Result;
|
||||||
import services.UserService;
|
import services.UserService;
|
||||||
|
|
||||||
@RunWith(NinjaRunner.class)
|
public class ApiControllerMockUnitTest extends NinjaTest {
|
||||||
public class ApiControllerMockIntegrationTest {
|
|
||||||
|
|
||||||
@Inject private UserService userService;
|
private UserService userService;
|
||||||
|
|
||||||
ApplicationController applicationController;
|
private ApplicationController applicationController;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setupTest() {
|
public void setupTest() {
|
||||||
|
userService = this.ninjaTestServer.getInjector().getInstance(UserService.class);
|
||||||
applicationController = new ApplicationController();
|
applicationController = new ApplicationController();
|
||||||
applicationController.userService = userService;
|
applicationController.userService = userService;
|
||||||
}
|
}
|
||||||
@@ -28,5 +28,5 @@ public class ApiControllerMockIntegrationTest {
|
|||||||
System.out.println(result.getRenderable());
|
System.out.println(result.getRenderable());
|
||||||
assertEquals(userService.getUserMap().toString(), result.getRenderable().toString());
|
assertEquals(userService.getUserMap().toString(), result.getRenderable().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user