Merge remote-tracking branch 'origin/master'

Author: JanHolger

src/main/java/org/javawebstack/framework/WebApplication.java

@@ -263,6 +263,10 @@ public I18N getTranslation() {
         return translation;
     }
 
+    public CommandSystem getCommandSystem() {
+        return commandSystem;
+    }
+
     protected void setupModules() {
     }
 

src/main/java/org/javawebstack/framework/testing/WebFrameworkTest.java

@@ -1,23 +1,39 @@
 package org.javawebstack.framework.testing;
 
+import org.javawebstack.command.CommandResult;
 import org.javawebstack.framework.WebApplication;
+import org.javawebstack.framework.config.Config;
 import org.javawebstack.httpserver.test.HTTPTest;
+import org.javawebstack.injector.Injector;
 
-public abstract class WebFrameworkTest {
+public abstract class WebFrameworkTest extends HTTPTest {
 
-    private HTTPTest httpTest;
     private WebApplication webApplication;
 
     public WebFrameworkTest(WebApplication webApplication){
+        super(webApplication.getServer());
+        webApplication.getInjector().inject(this);
+
         this.webApplication = webApplication;
-        httpTest = new HTTPTest(webApplication.getServer()) {};
     }
 
-    public HTTPTest getHttpTest() {
-        return httpTest;
+    public WebApplication getApplication() {
+        return webApplication;
     }
 
-    public WebApplication getWebApplication() {
-        return webApplication;
+    public Injector getInjector(){
+        return webApplication.getInjector();
+    }
+
+    public void seed(String name){
+        webApplication.getSeeder(name).seed();
+    }
+
+    public CommandResult runCommand(String... input){
+        return webApplication.getCommandSystem().eval(input);
+    }
+
+    public Config getConfig(){
+        return webApplication.getConfig();
     }
 }