From d4dcbf112600280b75fa488790e16e0b3e87173c Mon Sep 17 00:00:00 2001
From: Anastasios Ioannidis
 <121166333+anastasiosioannidis@users.noreply.github.com>
Date: Thu, 19 Jan 2023 19:58:20 +0200
Subject: [PATCH] JAVA-15609 Fixed failing tests (#13304)

---
 ....java => ApiControllerDocTesterUnitTest.java} |  6 +++---
 ...nTest.java => ApiControllerMockUnitTest.java} | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename web-modules/ninja/src/test/java/controllers/{ApiControllerDocTesterIntegrationTest.java => ApiControllerDocTesterUnitTest.java} (90%)
 rename web-modules/ninja/src/test/java/controllers/{ApiControllerMockIntegrationTest.java => ApiControllerMockUnitTest.java} (68%)

diff --git a/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterIntegrationTest.java b/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterUnitTest.java
similarity index 90%
rename from web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterIntegrationTest.java
rename to web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterUnitTest.java
index a075497dc8..64812f6935 100644
--- a/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterIntegrationTest.java
+++ b/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterUnitTest.java
@@ -7,11 +7,11 @@ import org.doctester.testbrowser.Response;
 import org.junit.Test;
 import ninja.NinjaDocTester;
 
-public class ApiControllerDocTesterIntegrationTest extends NinjaDocTester {
+public class ApiControllerDocTesterUnitTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
     String URL_HELLO = "/hello";
-    
+
     @Test
     public void testGetIndex() {
         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)));
         assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
     }
-    
+
 }
diff --git a/web-modules/ninja/src/test/java/controllers/ApiControllerMockIntegrationTest.java b/web-modules/ninja/src/test/java/controllers/ApiControllerMockUnitTest.java
similarity index 68%
rename from web-modules/ninja/src/test/java/controllers/ApiControllerMockIntegrationTest.java
rename to web-modules/ninja/src/test/java/controllers/ApiControllerMockUnitTest.java
index 53a760aadc..8534fa0b0f 100644
--- a/web-modules/ninja/src/test/java/controllers/ApiControllerMockIntegrationTest.java
+++ b/web-modules/ninja/src/test/java/controllers/ApiControllerMockUnitTest.java
@@ -1,23 +1,23 @@
 package controllers;
 
 import static org.junit.Assert.assertEquals;
-import javax.inject.Inject;
+
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import ninja.NinjaRunner;
+
+import ninja.NinjaTest;
 import ninja.Result;
 import services.UserService;
 
-@RunWith(NinjaRunner.class)
-public class ApiControllerMockIntegrationTest {
+public class ApiControllerMockUnitTest extends NinjaTest {
 
-    @Inject private UserService userService;
+    private UserService userService;
 
-    ApplicationController applicationController;
+    private ApplicationController applicationController;
 
     @Before
     public void setupTest() {
+        userService = this.ninjaTestServer.getInjector().getInstance(UserService.class);
         applicationController = new ApplicationController();
         applicationController.userService = userService;
     }
@@ -28,5 +28,5 @@ public class ApiControllerMockIntegrationTest {
         System.out.println(result.getRenderable());
         assertEquals(userService.getUserMap().toString(), result.getRenderable().toString());
     }
-    
+
 }