test

server/src/main/java/com/uqac/rthoni/java_rmi/server/executors/WriteExecutor.java

@@ -26,12 +26,12 @@ public class WriteExecutor extends AbstractCommandExecutor {
         Object obj = server.getObject(id);
         Class objClass = obj.getClass();
         Field field = objClass.getDeclaredField(fieldName);
-        Object typedValue = ReflectionUtil.toObject(field.getDeclaringClass(), value);
+        Object typedValue = ReflectionUtil.toObject(field.getType(), value);
 
         try {
             field.set(obj, typedValue);
         } catch (IllegalAccessException e) {
-            Method method = objClass.getDeclaredMethod(methodName, typedValue.getClass());
+            Method method = objClass.getDeclaredMethod(methodName, field.getType());
             method.invoke(obj, typedValue);
         }
 

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/AbstractTest.java

@@ -0,0 +1,33 @@
+package com.uqac.rthoni.java_rmi.server.executors;
+
+import com.uqac.rthoni.java_rmi.common.Command;
+import com.uqac.rthoni.java_rmi.server.ServerApplication;
+
+/**
+ * Created by robin on 9/16/16.
+ */
+public abstract class AbstractTest {
+
+    public String runCommand(ServerApplication app, String str) throws Exception {
+        Command command = Command.fromString(str);
+        AbstractCommandExecutor executor = app.getExecutor(command);
+        return executor.run(command, app);
+    }
+
+    public String runCommands(ServerApplication app, String ...str) throws Exception {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String s : str) {
+            String res = runCommand(app, s);
+            if (res != null) {
+                stringBuilder.append(res);
+            }
+        }
+        return stringBuilder.toString();
+    }
+
+    public ServerApplication getServer() throws Exception {
+        ServerApplication app = new ServerApplication();
+        app.loadExecutors();
+        return app;
+    }
+}

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/NewInstanceExecutorTest.java

@@ -4,40 +4,31 @@ import com.uqac.rthoni.java_rmi.common.Command;
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
 import org.junit.Test;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.*;
 
 /**
  * Created by robin on 9/16/16.
  */
-public class NewInstanceExecutorTest {
-
-    public String runCommand(String str, ServerApplication app) throws Exception {
-        Command command = Command.fromString(str);
-        AbstractCommandExecutor executor = app.getExecutor(command);
-        return executor.run(command, app);
-    }
-
-    public ServerApplication getServer() throws Exception {
-        ServerApplication app = new ServerApplication();
-        app.loadExecutors();
-        return app;
-    }
+public class NewInstanceExecutorTest extends AbstractTest {
 
     @Test
     public void test1() throws Exception
     {
         ServerApplication app = getServer();
-        String res = runCommand("creation#com.uqac.rthoni.java_rmi.server.TestDbo#test", app);
+        String res = runCommand(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test");
         assertNull(res);
         Object obj = app.getObject("test");
         assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
     }
 
     @Test
     public void test2() throws Exception
     {
         ServerApplication app = getServer();
-        String res = runCommand("creation#java.lang.String#mystr", app);
+        String res = runCommand(app, "creation#java.lang.String#mystr");
         assertNull(res);
         Object obj = app.getObject("mystr");
         assertNotNull(obj);
@@ -47,7 +38,8 @@ public class NewInstanceExecutorTest {
     @Test(expected = ClassNotFoundException.class)
     public void test3() throws Exception
     {
-        runCommand("creation#not_existing_class#myobj", getServer());
+        ServerApplication app = getServer();
+        runCommand(app, "creation#not_existing_class#myobj");
     }
 
 }

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/ReadExecutorTest.java

@@ -0,0 +1,82 @@
+package com.uqac.rthoni.java_rmi.server.executors;
+
+import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by robin on 9/16/16.
+ */
+public class ReadExecutorTest extends AbstractTest {
+
+    @Test
+    public void test1() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#publicInt");
+        assertEquals(res, "42");
+    }
+
+    @Test
+    public void test2() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#privateInt");
+        assertEquals(res, "24");
+    }
+
+    @Test
+    public void test3() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#privateString");
+        assertEquals(res, "default_value");
+    }
+
+    @Test(expected = NoSuchMethodException.class)
+    public void test4() throws Exception
+    {
+        ServerApplication app = getServer();
+        runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#aPrivateField");
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void test5() throws Exception
+    {
+        ServerApplication app = getServer();
+        runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test2#privateString");
+    }
+
+    @Test
+    public void test6() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#publicFloat");
+        assertEquals(res, "0.42");
+    }
+
+    @Test
+    public void test7() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#publicDouble");
+        assertEquals(res, "0.125");
+    }
+
+    @Test
+    public void test8() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "lecture#test#publicBool");
+        assertEquals(res, "true");
+    }
+}

server/src/main/java/com/uqac/rthoni/java_rmi/server/TestDbo.java → server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/TestDbo.java

@@ -1,4 +1,4 @@
-package com.uqac.rthoni.java_rmi.server;
+package com.uqac.rthoni.java_rmi.server.executors;
 
 /**
  * Created by robin on 9/16/16.
@@ -10,6 +10,14 @@ public class TestDbo {
 
     public int publicInt = 42;
 
+    private int aPrivateField = 0;
+
+    public float publicFloat = 0.42f;
+
+    public double publicDouble = 0.125f;
+
+    public boolean publicBool = true;
+
     public String getPrivateString() {
         return privateString;
     }
@@ -29,4 +37,15 @@ public class TestDbo {
     public void setPrivateInteger(Integer privateInt) {
         this.privateInt = privateInt;
     }
+
+    public String getMyself(String str)
+    {
+        return str;
+    }
+
+    public String toString()
+    {
+        return String.format("privateString=%s, privateInt=%d, publicInt=%d, aPrivateField=%d, publicFloat=%f, publicDouble=%f, publicBool=%b",
+                privateString, privateInt, publicInt, aPrivateField, publicFloat, publicDouble, publicBool);
+    }
 }

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/WriteExecutorTest.java

@@ -0,0 +1,77 @@
+package com.uqac.rthoni.java_rmi.server.executors;
+
+import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by robin on 9/16/16.
+ */
+public class WriteExecutorTest extends AbstractTest {
+
+    @Test
+    public void test1() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "ecriture#test#publicInt#24",
+                "lecture#test#publicInt");
+        assertEquals(res, "24");
+        Object obj = app.getObject("test");
+        assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=24, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
+    }
+
+    @Test
+    public void test2() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "ecriture#test#privateInt#42",
+                "lecture#test#privateInt");
+        assertEquals(res, "42");
+        Object obj = app.getObject("test");
+        assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=default_value, privateInt=42, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
+    }
+
+    @Test
+    public void test3() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "ecriture#test#privateString#a_value",
+                "lecture#test#privateString");
+        assertEquals(res, "a_value");
+        Object obj = app.getObject("test");
+        assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=a_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
+    }
+
+    @Test
+    public void test4() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "ecriture#test#publicFloat#4242.5",
+                "lecture#test#publicFloat");
+        assertEquals(res, "4242.5");
+        Object obj = app.getObject("test");
+        assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=4242.500000, publicDouble=0.125000, publicBool=true");
+    }
+
+    @Test
+    public void test5() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "ecriture#test#publicBool#false",
+                "lecture#test#publicBool");
+        assertEquals(res, "false");
+        Object obj = app.getObject("test");
+        assertNotNull(obj);
+        assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=false");
+    }
+}

uqac-java-rmi.iml

@@ -9,10 +9,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="server" />
     <orderEntry type="module" module-name="client" />
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="server" />
   </component>
 </module>