add tests

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/util/ObjectUtil.java

@@ -1,18 +1,20 @@
-package net.lecousin.framework.util;
-
-/** Utility methods on objects. */
-public class ObjectUtil {
-
-	/** Return true if both are null, or if they are equals. */
-	public static boolean equalsOrNull(Object o1, Object o2) {
-		if (o1 == null) return o2 == null;
-		return o1.equals(o2);
-	}
-	
-	/** Return "null" if o is null, else call the method toString on the object. */
-	public static String toString(Object o) {
-		if (o == null) return "null";
-		return o.toString();
-	}
-	
-}
+package net.lecousin.framework.util;
+
+/** Utility methods on objects. */
+public final class ObjectUtil {
+	
+	private ObjectUtil() { /* no instance */ }
+
+	/** Return true if both are null, or if they are equals. */
+	public static boolean equalsOrNull(Object o1, Object o2) {
+		if (o1 == null) return o2 == null;
+		return o1.equals(o2);
+	}
+	
+	/** Return "null" if o is null, else call the method toString on the object. */
+	public static String toString(Object o) {
+		if (o == null) return "null";
+		return o.toString();
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/progress/TestFakeWorkProgress.java

@@ -0,0 +1,32 @@
+package net.lecousin.framework.core.tests.progress;
+
+import net.lecousin.framework.concurrent.CancelException;
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.progress.FakeWorkProgress;
+
+import org.junit.Test;
+
+public class TestFakeWorkProgress extends LCCoreAbstractTest {
+
+	@Test(timeout=30000)
+	public void test() {
+		FakeWorkProgress p = new FakeWorkProgress();
+		p.getPosition();
+		p.getAmount();
+		p.getRemainingWork();
+		p.getText();
+		p.getSubText();
+		p.progress(0);
+		p.done();
+		p.error(new Exception());
+		p.cancel(new CancelException("test"));
+		p.getSynch();
+		p.setAmount(0);
+		p.setPosition(0);
+		p.setText("");
+		p.setSubText("");
+		p.listen(() -> {});
+		p.unlisten(() -> {});
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/progress/TestMultiTaskProgress.java

@@ -39,6 +39,14 @@ public void test() {
 		Assert.assertEquals(300, t3.getAmount());
 		Assert.assertEquals(300, t3.getPosition());
 		Assert.assertEquals(0, t3.getRemainingWork());
+		t3.setAmount(600);
+		t3.setPosition(400);
+		Assert.assertEquals(1400, p.getAmount());
+		Assert.assertEquals(450, p.getPosition());
+		Assert.assertEquals(950, p.getRemainingWork());
+		Assert.assertEquals(600, t3.getAmount());
+		Assert.assertEquals(400, t3.getPosition());
+		Assert.assertEquals(200, t3.getRemainingWork());
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/progress/TestWorkProgressImpl.java

@@ -1,5 +1,6 @@
 package net.lecousin.framework.core.tests.progress;
 
+import net.lecousin.framework.concurrent.CancelException;
 import net.lecousin.framework.concurrent.synch.SynchronizationPoint;
 import net.lecousin.framework.core.test.LCCoreAbstractTest;
 import net.lecousin.framework.progress.WorkProgressImpl;
@@ -55,13 +56,43 @@ public void test() throws Exception {
 		changed.blockThrow(0);
 		changed.reset();
 		p.unlisten(listener);
+		p.unlisten(listener);
+		Runnable listener1 = () -> {};
+		Runnable listener2 = () -> {};
+		p.listen(listener1);
+		p.listen(listener2);
+		p.unlisten(listener1);
+		p.unlisten(listener2);
 		p.progress(1);
 		Assert.assertEquals(1000, p.getAmount());
 		Assert.assertEquals(699, p.getRemainingWork());
 		Assert.assertEquals(301, p.getPosition());
 		changed.blockThrow(500);
 		Assert.assertFalse(changed.isUnblocked());
+		p.setAmount(900);
+		Assert.assertEquals(900, p.getAmount());
+		Assert.assertEquals(599, p.getRemainingWork());
+		Assert.assertEquals(301, p.getPosition());
+		p.setAmount(900);
+		Assert.assertEquals(900, p.getAmount());
+		Assert.assertEquals(599, p.getRemainingWork());
+		Assert.assertEquals(301, p.getPosition());
+		p.setPosition(400);
+		Assert.assertEquals(900, p.getAmount());
+		Assert.assertEquals(500, p.getRemainingWork());
+		Assert.assertEquals(400, p.getPosition());
+		p.setPosition(400);
+		Assert.assertEquals(900, p.getAmount());
+		Assert.assertEquals(500, p.getRemainingWork());
+		Assert.assertEquals(400, p.getPosition());
+		p.progress(0);
+		Assert.assertEquals(900, p.getAmount());
+		Assert.assertEquals(500, p.getRemainingWork());
+		Assert.assertEquals(400, p.getPosition());
 		p.done();
+		p.error(new Exception());
+		p.cancel(new CancelException(new Exception()));
+		p.getSynch();
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestObjectUtil.java

@@ -0,0 +1,23 @@
+package net.lecousin.framework.core.tests.util;
+
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.util.ObjectUtil;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestObjectUtil extends LCCoreAbstractTest {
+
+	@Test(timeout=30000)
+	public void test() {
+		Assert.assertTrue(ObjectUtil.equalsOrNull(null, null));
+		Assert.assertFalse(ObjectUtil.equalsOrNull(new Object(), null));
+		Assert.assertFalse(ObjectUtil.equalsOrNull(null, new Object()));
+		Assert.assertTrue(ObjectUtil.equalsOrNull(Integer.valueOf(1), Integer.valueOf(1)));
+		Assert.assertFalse(ObjectUtil.equalsOrNull(Integer.valueOf(1), Integer.valueOf(2)));
+		
+		Assert.assertEquals("null", ObjectUtil.toString(null));
+		Assert.assertEquals("1", ObjectUtil.toString(Integer.valueOf(1)));
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestPair.java

@@ -1,5 +1,10 @@
 package net.lecousin.framework.core.tests.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 import net.lecousin.framework.core.test.LCCoreAbstractTest;
 import net.lecousin.framework.util.Pair;
 
@@ -9,7 +14,7 @@
 public class TestPair extends LCCoreAbstractTest {
 
 	@Test
-	public void test() {
+	public void test() throws Exception {
 		Pair<Object, Object> p;
 		p = new Pair<>(Integer.valueOf(10), Integer.valueOf(20));
 		Assert.assertEquals(Integer.valueOf(10), p.getValue1());
@@ -27,6 +32,15 @@ public void test() {
 		p.toString();
 		new Pair<>(null, null).hashCode();
 		new Pair<>(null, null).toString();
+		
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		ObjectOutputStream oout = new ObjectOutputStream(out);
+		oout.writeObject(new Pair<>(Integer.valueOf(10), "test"));
+		oout.close();
+		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+		ObjectInputStream oin = new ObjectInputStream(in);
+		Assert.assertEquals(new Pair<>(Integer.valueOf(10), "test"), oin.readObject());
+		oin.close();
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestRunnableWithData.java

@@ -0,0 +1,21 @@
+package net.lecousin.framework.core.tests.util;
+
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.util.RunnableWithData;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestRunnableWithData extends LCCoreAbstractTest {
+
+	@Test(timeout=30000)
+	public void test() {
+		RunnableWithData<String> r = new RunnableWithData<String>("test") {
+			@Override
+			public void run() {
+			}
+		};
+		Assert.assertEquals("test", r.getData());
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestTriple.java

@@ -9,7 +9,7 @@
 public class TestTriple extends LCCoreAbstractTest {
 
 	@Test
-	public void test() {
+	public void test() throws Exception {
 		Triple<Object, Object, Object> t;
 		t = new Triple<>(Integer.valueOf(10), Integer.valueOf(20), Integer.valueOf(30));
 		Assert.assertEquals(Integer.valueOf(10), t.getValue1());