Re-structured the test commons.

rapidoid · Feb 25, 2018 · a5c2f32 · a5c2f32
1 parent 59d400c
commit a5c2f32
Show file tree

Hide file tree

Showing 18 changed files with 576 additions and 254 deletions.
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java b/rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java
@@ -27,6 +27,7 @@
 import org.rapidoid.env.Env;
 import org.rapidoid.io.IO;
 import org.rapidoid.test.AbstractCommonsTest;
+import org.rapidoid.test.TestIO;
 import org.rapidoid.util.Msc;
 
 @Authors("Nikolche Mihajlovski")
@@ -41,7 +42,7 @@ public void reset() {
 
 	@Test
 	public void testConfigRootSetup() {
-		String dir = createTempDir("app");
+		String dir = TestIO.createTempDir("app");
 
 		IO.save(Msc.path(dir, "config.yml"), "id: abc1");
 
@@ -52,7 +53,7 @@ public void testConfigRootSetup() {
 
 	@Test
 	public void testConfigRootAndFileSetup() {
-		String dir = createTempDir("app");
+		String dir = TestIO.createTempDir("app");
 
 		IO.save(Msc.path(dir, "the-config.yml"), "id: abc2");
 

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java b/rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java
@@ -26,6 +26,7 @@
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
 import org.rapidoid.test.AbstractCommonsTest;
+import org.rapidoid.test.TestRnd;
 import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
@@ -39,7 +40,7 @@ public void testAppCtx() {
 		multiThreaded(1000, 1000000, () -> {
 			Ctxs.open("test");
 
-			UserInfo user = new UserInfo(rndStr(10), U.set("role1"), null);
+			UserInfo user = new UserInfo(TestRnd.rndStr(10), U.set("role1"), null);
 
 			Ctxs.required().setUser(user);
 

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java b/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.job.Jobs;
 import org.rapidoid.test.AbstractCommonsTest;
+import org.rapidoid.test.TestRnd;
 import org.rapidoid.u.U;
 
 import java.util.concurrent.ScheduledFuture;
@@ -44,7 +45,7 @@ public void testJobsExecution() {
 		multiThreaded(1000, total, () -> {
 			Ctxs.open("test-job");
 
-			final UserInfo user = new UserInfo(rndStr(50), U.set("role1"), null);
+			final UserInfo user = new UserInfo(TestRnd.rndStr(50), U.set("role1"), null);
 
 			Ctxs.required().setUser(user);
 			ensureProperContext(user);

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java b/rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java
@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Test;
 import org.rapidoid.test.TestCommons;
+import org.rapidoid.test.TestIO;
 import org.rapidoid.u.U;
 
 import java.util.List;
@@ -42,14 +43,14 @@ public class YAMLTest extends TestCommons {
 
 	@Test
 	public void parseMap() {
-		String yaml = new String(loadRes("test.yaml"));
+		String yaml = new String(TestIO.loadRes("test.yaml"));
 		Map<String, Object> data = YAML.parseMap(yaml);
 		eq(data, U.map("aa", 1, "bb", "2am", "cc", U.map("x", true, "z", false)));
 	}
 
 	@Test
 	public void parseBeans() {
-		String yaml = new String(loadRes("persons.yaml"));
+		String yaml = new String(TestIO.loadRes("persons.yaml"));
 
 		List<User> persons = YAML.parse(yaml, personList);
 		eq(persons.size(), 2);

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java b/rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.test.TestCommons;
+import org.rapidoid.test.TestRnd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -40,7 +41,7 @@ public void testUri() throws IOException {
 		check(12345, -125521209, Long.MIN_VALUE);
 
 		for (int i = 0; i < 1000000; i++) {
-			check(RND.nextLong(), RND.nextLong(), RND.nextLong());
+			check(TestRnd.rndL(), TestRnd.rndL(), TestRnd.rndL());
 		}
 	}
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpLoginTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpLoginTest.java
@@ -30,6 +30,7 @@
 import org.rapidoid.log.LogLevel;
 import org.rapidoid.security.Role;
 import org.rapidoid.setup.On;
+import org.rapidoid.test.TestCtx;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 
@@ -64,6 +65,7 @@ public void testLogin() {
 		multiThreaded(Msc.normalOrHeavy(5, 150), Msc.normalOrHeavy(10, 15000), this::randomUserLogin);
 	}
 
+	@TestCtx
 	private void randomUserLogin() {
 		while (!ready) U.sleep(100); // wait
 

diff --git a/rapidoid-networking/src/test/java/org/rapidoid/buffer/BufRangeTest.java b/rapidoid-networking/src/test/java/org/rapidoid/buffer/BufRangeTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.data.BufRange;
+import org.rapidoid.test.TestRnd;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
@@ -57,7 +58,7 @@ public void statisticalTest() {
 		}
 
 		for (int i = 0; i < 1000000; i++) {
-			check(rng, rnd(), rnd());
+			check(rng, TestRnd.rnd(), TestRnd.rnd());
 		}
 	}
 
@@ -68,7 +69,7 @@ private void check(BufRange rng, int a, int b) {
 		eq(rng.limit(), rng.start + rng.length);
 
 		long backup = rng.backup();
-		rng.set(rnd(), rnd());
+		rng.set(TestRnd.rnd(), TestRnd.rnd());
 
 		rng.restore(backup);
 		eq(rng, a, b);

diff --git a/rapidoid-networking/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java b/rapidoid-networking/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.Err;
+import org.rapidoid.test.TestRnd;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
@@ -37,14 +38,14 @@ public void shouldExpandAndShrink() {
 		String s;
 
 		for (int i = 0; i < 1000; i++) {
-			if (rnd(3) > 0 || copy.isEmpty()) {
+			if (TestRnd.rnd(3) > 0 || copy.isEmpty()) {
-				s = rndStr(0, 9);
+				s = TestRnd.rndStr(0, 9);
 				buf.append(s);
 				copy += s;
 			} else {
-				int len = rnd(Math.min(17, copy.length() + 1));
+				int len = TestRnd.rnd(Math.min(17, copy.length() + 1));
 
-				switch (rnd(3)) {
+				switch (TestRnd.rnd(3)) {
 					case 0:
 						copy = copy.substring(len);
 						buf.deleteBefore(len);
@@ -56,10 +57,10 @@ public void shouldExpandAndShrink() {
 						break;
 
 					case 2:
-						s = rndStr(0, len);
+						s = TestRnd.rndStr(0, len);
 						int maxPos = copy.length() - s.length();
 						assert maxPos >= 0;
-						int pos = rnd(maxPos + 1); // range [0..maxPos]
+						int pos = TestRnd.rnd(maxPos + 1); // range [0..maxPos]
 
 						copy = copy.substring(0, pos) + s + copy.substring(pos + s.length());
 						buf.put(pos, s.getBytes(), 0, s.length());
@@ -70,7 +71,7 @@ public void shouldExpandAndShrink() {
 				}
 			}
 
-			if (rnd(1000) == 0) {
+			if (TestRnd.rnd(1000) == 0) {
 				copy = "";
 				buf.clear();
 			}