diff --git a/ninja-core/src/site/markdown/developer/changelog.md b/ninja-core/src/site/markdown/developer/changelog.md
index a04edadf15..17b0454d03 100644
--- a/ninja-core/src/site/markdown/developer/changelog.md
+++ b/ninja-core/src/site/markdown/developer/changelog.md
@@ -1,7 +1,9 @@
+
Version X.X.X
=============
* 2016-02-26 Removed ninja-core dependency on org.mindrot:bcrypt (it was unused) (jjlauer)
+ * 2016-02-25 New RecycledNinjaServerTester in ninja-test-utilities to speed up your unit tests (jjlauer)
* 2016-01-08 Fix Cookie domain is not set when clearing session #462
Version 5.3.1
diff --git a/ninja-core/src/site/markdown/documentation/testing_your_application/ninja_recycled_tester.md b/ninja-core/src/site/markdown/documentation/testing_your_application/ninja_recycled_tester.md
new file mode 100644
index 0000000000..47b5c2732f
--- /dev/null
+++ b/ninja-core/src/site/markdown/documentation/testing_your_application/ninja_recycled_tester.md
@@ -0,0 +1,35 @@
+RecycledNinjaServerTester
+=========================
+
+Introduction
+------------
+
+RecycledNinjaServerTester provides much of the same functionality as NinjaTest,
+but starts up a single Ninja test server for all tests in a Junit test class.
+
+If you're unit tests do not rely on a fresh server then this approach will
+dramatically increase the speed of your unit tests.
+
+
+public class MyControllerTest extends RecycledNinjaServerTester {
+
+ @Test
+ public void testThatHomepageWorks() {
+ NinjaTestBrowser ninjaTestBrowser = new NinjaTestBrowser();
+
+ // redirect will send a location: redirect in the headers
+ String result = ninjaTestBrowser.makeRequest(withBaseUrl("/"));
+
+ // If the redirect has worked we must see the following text
+ // from the index screen:
+ assertTrue(result.contains("Hello to the blog example!"));
+ assertTrue(result.contains("My second post"));
+ }
+
+}
+
+
+If you want to revert back to a single Ninja test server for each test method,
+you can simply extend your class from FreshNinjaServerTester.
+
+
\ No newline at end of file
diff --git a/ninja-core/src/site/site.xml b/ninja-core/src/site/site.xml
index d84db41530..98ccee7e26 100644
--- a/ninja-core/src/site/site.xml
+++ b/ninja-core/src/site/site.xml
@@ -123,6 +123,7 @@
NinjaTestServer for each unit test in your
+ * junit test class. Unless you really need a fresh server for each unit test,
+ * please note that its fairly expensive to start/stop a ninja test server
+ * for each unit test.
*
- * @author hschuetz
+ *
+ * public class MyControllerTest extends FreshNinjaServerTester {
*
+ * @Test
+ * public void usersIndex() {
+ * String url = withBaseUrl("/users");
+ * // do rest of test...
+ * }
+ *
+ * }
+ *
+ *
+ * @see RecycledNinjaServerTester
*/
-public abstract class NinjaDocTester extends DocTester {
+public class FreshNinjaServerTester extends BaseNinjaServerTester {
+
private NinjaTestServer ninjaTestServer;
-
- public NinjaDocTester() {
- }
-
+
@Before
- public void startServerInTestMode() {
+ public void startNinjaServer() {
ninjaTestServer = new NinjaTestServer();
}
@After
- public void shutdownServer() {
+ public void shutdownNinjaServer() {
ninjaTestServer.shutdown();
}
@Override
- public Url testServerUrl() {
- // v5.1.5+ includes configured context path
- return Url.host(ninjaTestServer.getBaseUrl());
- }
-
- public Injector getInjector() {
- return ninjaTestServer.getInjector();
+ public NinjaTestServer getNinjaTestServer() {
+ return ninjaTestServer;
}
}
diff --git a/ninja-test-utilities/src/main/java/ninja/RecycledNinjaServerTester.java b/ninja-test-utilities/src/main/java/ninja/RecycledNinjaServerTester.java
new file mode 100644
index 0000000000..35b64fe035
--- /dev/null
+++ b/ninja-test-utilities/src/main/java/ninja/RecycledNinjaServerTester.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2012-2016 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 ninja;
+
+import ninja.utils.NinjaMode;
+import ninja.utils.NinjaTestServer;
+import org.junit.ClassRule;
+import org.junit.rules.ExternalResource;
+
+/**
+ * Uses a single NinjaTestServer per junit test class. The server
+ * is started a single time when the class loads and used across all tests.
+ * If you're unit tests do not rely on a fresh server then this approach will
+ * dramatically increase the speed of your unit tests -- by not starting up
+ * and shutting down a ninja test server for each unit test.
+ *
+ *
+ * public class MyControllerTest extends RecycledNinjaServerTester {
+ *
+ * @Test
+ * public void usersIndex() {
+ * String url = withBaseUrl("/users");
+ * // do rest of test...
+ * }
+ *
+ * }
+ *
+ *
+ * @see FreshNinjaServerTester
+ */
+public class RecycledNinjaServerTester extends BaseNinjaServerTester {
+
+ static private NinjaTestServer ninjaTestServer;
+
+ @ClassRule
+ static public ExternalResource ninjaTestServerResource = new ExternalResource() {
+ @Override
+ protected void before() throws Throwable {
+ ninjaTestServer = new NinjaTestServer(NinjaMode.test);
+ }
+
+ @Override
+ protected void after() {
+ ninjaTestServer.shutdown();
+ ninjaTestServer = null;
+ }
+ };
+
+ @Override
+ public NinjaTestServer getNinjaTestServer() {
+ return ninjaTestServer;
+ }
+
+}