Reorganized some integration tests.

rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java

@@ -22,7 +22,6 @@
 
 import org.junit.Before;
 import org.rapidoid.config.Conf;
-import org.rapidoid.data.JSON;
 import org.rapidoid.util.Msc;
 
 public abstract class AbstractCommonsTest extends TestCommons {
@@ -34,8 +33,4 @@ public final void resetContext() {
 		Conf.ROOT.setPath(getTestNamespace());
 	}
 
-	protected void verify(String name, Object actual) {
-		super.verifyCase(name, JSON.prettify(actual), name);
-	}
-
 }

rapidoid-commons/src/test/java/org/rapidoid/config/ConfigurationTest.java → rapidoid-integration-tests/src/test/java/org/rapidoid/config/ConfigurationTest.java

@@ -26,13 +26,13 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.env.Env;
 import org.rapidoid.env.EnvMode;
-import org.rapidoid.test.AbstractCommonsTest;
+import org.rapidoid.http.IsolatedIntegrationTest;
 import org.rapidoid.u.U;
 import org.rapidoid.util.MscOpts;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.1.0")
-public class ConfigurationTest extends AbstractCommonsTest {
+public class ConfigurationTest extends IsolatedIntegrationTest {
 
 	private static boolean TLS_ENABLED = MscOpts.isTLSEnabled();
 
@@ -156,9 +156,9 @@ public void testMySqlProfile() {
 
 		eq(Env.profiles(), U.set("mysql", "test"));
 
-		verify("jdbc-mysql-profile", Conf.JDBC.toMap());
-		verify("hibernate-mysql-profile", Conf.HIBERNATE.toMap());
-		verify("root", Conf.ROOT.toMap());
+		verifyJson("jdbc-mysql-profile", Conf.JDBC.toMap());
+		verifyJson("hibernate-mysql-profile", Conf.HIBERNATE.toMap());
+		verifyJson("root", Conf.ROOT.toMap());
 	}
 
 	@Test
@@ -169,9 +169,9 @@ public void testPostgresProfile() {
 
 		eq(Env.profiles(), U.set("postgres", "test"));
 
-		verify("jdbc-postgres-profile", Conf.JDBC.toMap());
-		verify("hibernate-postgres-profile", Conf.HIBERNATE.toMap());
-		verify("root", Conf.ROOT.toMap());
+		verifyJson("jdbc-postgres-profile", Conf.JDBC.toMap());
+		verifyJson("hibernate-postgres-profile", Conf.HIBERNATE.toMap());
+		verifyJson("root", Conf.ROOT.toMap());
 	}
 
 	@Test
@@ -182,14 +182,14 @@ public void testPlatformProfile() {
 
 		eq(Env.profiles(), U.set("platform", "test"));
 
-		verify("root", Conf.ROOT.toMap());
+		verifyJson("root", Conf.ROOT.toMap());
 	}
 
 	@Test
 	public void testBuiltInConfig() {
 		if (TLS_ENABLED) return;
 
-		verify("root", Conf.ROOT.toMap());
+		verifyJson("root", Conf.ROOT.toMap());
 	}
 
 //	private Map<String, Object> rootCfgMasked() {

rapidoid-integration-tests/src/test/java/org/rapidoid/http/IsolatedIntegrationTest.java

@@ -393,6 +393,10 @@ protected void verifyNoRoutes() {
 		isTrue(On.routes().all().isEmpty());
 	}
 
+	protected void verifyJson(String name, Object actual) {
+		verifyCase(name, JSON.prettify(actual), name);
+	}
+
 	protected void tx(Runnable action) {
 		JPA.transaction(action);
 	}

rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/AutowireDependenciesTest.java → rapidoid-integration-tests/src/test/java/org/rapidoid/ioc/AutowireDependenciesTest.java

@@ -1,4 +1,4 @@
-package org.rapidoid.ioc.basic;
+package org.rapidoid.ioc;
 
 /*
  * #%L
@@ -23,17 +23,15 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.ioc.Manage;
-import org.rapidoid.ioc.Wired;
-import org.rapidoid.test.RapidoidIntegrationTest;
+import org.rapidoid.http.IsolatedIntegrationTest;
 
 import javax.inject.Inject;
 import java.util.concurrent.Callable;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")
 @Manage(MyCallable.class)
-public class AutowireDependenciesTest extends RapidoidIntegrationTest {
+public class AutowireDependenciesTest extends IsolatedIntegrationTest {
 
 	static class B {
 		@Inject

rapidoid-integration-tests/src/test/java/org/rapidoid/ioc/Foo.java

@@ -0,0 +1,35 @@
+package org.rapidoid.ioc;
+
+/*
+ * #%L
+ * rapidoid-inject
+ * %%
+ * Copyright (C) 2014 - 2017 Nikolche Mihajlovski and contributors
+ * %%
+ * 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.
+ * #L%
+ */
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
+
+import java.util.concurrent.Callable;
+
+@Authors("Nikolche Mihajlovski")
+@Since("2.0.0")
+public class Foo {
+
+	@Wired
+	Callable<String> callable;
+
+}

rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/TestAutowireTest.java → rapidoid-integration-tests/src/test/java/org/rapidoid/ioc/InjectAutowireTest.java

@@ -1,4 +1,4 @@
-package org.rapidoid.ioc.basic;
+package org.rapidoid.ioc;
 
 /*
  * #%L
@@ -23,14 +23,13 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.ioc.Wired;
-import org.rapidoid.test.RapidoidIntegrationTest;
+import org.rapidoid.http.IsolatedIntegrationTest;
 
 import javax.inject.Inject;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")
-public class TestAutowireTest extends RapidoidIntegrationTest {
+public class InjectAutowireTest extends IsolatedIntegrationTest {
 
 	static class B {
 		@Inject

rapidoid-integration-tests/src/test/java/org/rapidoid/ioc/MyCallable.java

@@ -0,0 +1,40 @@
+package org.rapidoid.ioc;
+
+/*
+ * #%L
+ * rapidoid-inject
+ * %%
+ * Copyright (C) 2014 - 2017 Nikolche Mihajlovski and contributors
+ * %%
+ * 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.
+ * #L%
+ */
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
+
+import java.util.concurrent.Callable;
+
+@Authors("Nikolche Mihajlovski")
+@Since("2.0.0")
+public class MyCallable implements Callable<String> {
+
+	@Wired
+	Foo foo;
+
+	@Override
+	public String call() throws Exception {
+		return "abc";
+	}
+
+}