Ninja framework changes

ninja/src/test/java/controllers/ApiControllerDocTesterTest.java

@@ -1,78 +1,38 @@
-/**
- * Copyright (C) 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Copyright (C) 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package controllers;
 
-
-import org.junit.Test;
-
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.hamcrest.CoreMatchers;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 
+import javax.inject.Inject;
+
+import org.doctester.testbrowser.Request;
+import org.doctester.testbrowser.Response;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import ninja.NinjaDocTester;
+import services.UserService;
+
 public class ApiControllerDocTesterTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
-    String URL_HELLO_WORLD_JSON = "/hello_world.json";
+    String URL_HELLO = "/hello";
+    String URL_USER_JSON = "/userJson";
+    String URL_USERS = "/users";
+    
+    @Mock
+    UserService userService;
     
     @Test
     public void testGetIndex() {
-    
-        Response response = makeRequest(
-                Request.GET().url(
-                        testServerUrl().path(URL_INDEX)));
-
-        assertThat(response.payload, containsString("Hello World!"));
-        assertThat(response.payload, containsString("BAM!"));
-
-
+        Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_INDEX)));
+        assertThat(response.payload, containsString("Bonjour, bienvenue dans Ninja Framework!"));
     }
     
     @Test
-    public void testGetHelloWorldJson() {
-    
-        Response response = makeRequest(
-                Request.GET().url(
-                        testServerUrl().path(URL_HELLO_WORLD_JSON)));
-
-        ApplicationController.SimplePojo simplePojo 
-                = response.payloadJsonAs(ApplicationController.SimplePojo.class);
-        
-        assertThat(simplePojo.content, CoreMatchers.equalTo("Hello World! Hello Json!"));
-
-    
+    public void testGetHello() {
+        Response response = makeRequest(Request.GET().url(testServerUrl().path(URL_HELLO)));
+        assertThat(response.payload, containsString("Hello, welcome to Ninja Framework!"));
     }
-
+    
 }

ninja/src/test/java/controllers/ApiControllerMockTest.java

@@ -0,0 +1,41 @@
+package controllers;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+
+import javax.inject.Inject;
+
+import org.doctester.testbrowser.Request;
+import org.doctester.testbrowser.Response;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+import ninja.NinjaRunner;
+import ninja.Result;
+import services.UserService;
+
+@RunWith(NinjaRunner.class)
+public class ApiControllerMockTest {
+
+    @Inject private UserService userService;
+
+    ApplicationController applicationController;
+
+    @Before
+    public void setupTest() {
+        applicationController = new ApplicationController();
+        applicationController.userService = userService;
+    }
+
+    @Test
+    public void testThatGetUserJson() {
+        Result result = applicationController.userJson();
+        System.out.println(result.getRenderable());
+        assertEquals(userService.getUser().toString(), result.getRenderable().toString());
+    }
+    
+}