tests

common/src/main/java/com/uqac/rthoni/java_rmi/common/Command.java

@@ -69,14 +69,20 @@ public class Command implements Serializable {
         return _arguments.size();
     }
 
-    public String getArgument(int i)
+    public String getArgument(int i, boolean optional)
     {
+        if (i >= _arguments.size() && optional) {
+            return "";
+        }
         return _arguments.get(i);
     }
 
-    public Vector<String> getArgmumentAsList(int i)
+    public Vector<String> getArgumentAsList(int i, boolean optional)
     {
-        return new Vector<String>(Arrays.asList(_arguments.get(i).split(",")));
+        if (i >= _arguments.size() && optional) {
+            return new Vector<>();
+        }
+        return new Vector<>(Arrays.asList(_arguments.get(i).split(",")));
     }
 
     public void setResult(String result)

common/src/test/java/com/uqac/rthoni/java_rmi/common/CommandTest.java

@@ -96,7 +96,7 @@ public class CommandTest {
         assertNotNull(c);
         assertEquals(c.getCommandName(), "Test");
         assertEquals(c.getArgumentCount(), 1);
-        assertEquals(c.getArgument(0), "an_argument");
+        assertEquals(c.getArgument(0, false), "an_argument");
     }
 
     @Test
@@ -106,7 +106,7 @@ public class CommandTest {
         assertNotNull(c);
         assertEquals(c.getCommandName(), "Test");
         assertEquals(c.getArgumentCount(), 2);
-        assertEquals(c.getArgument(0), "an_argument");
-        assertEquals(c.getArgument(1), "an_argument2");
+        assertEquals(c.getArgument(0, false), "an_argument");
+        assertEquals(c.getArgument(1, false), "an_argument2");
     }
 }

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

@@ -20,10 +20,10 @@ public class MethodExecutor extends AbstractCommandExecutor {
 
     @Override
     public String run(Command command, ServerApplication server) throws Exception {
-        String id = command.getArgument(0);
-        String methodName = command.getArgument(1);
+        String id = command.getArgument(0, false);
+        String methodName = command.getArgument(1, false);
         Object obj = server.getObject(id);
-        List<Pair<Class, String>> argClasses = command.getArgmumentAsList(2).stream().map(v -> {
+        List<Pair<Class, String>> argClasses = command.getArgumentAsList(2, true).stream().map(v -> {
             String[] split = v.split(":");
             try {
                 return new Pair<>(ReflectionUtil.getClass(split[0]), split[1]);

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

@@ -14,8 +14,8 @@ public class NewInstanceExecutor extends AbstractCommandExecutor {
 
     @Override
     public String run(Command command, ServerApplication server) throws Exception {
-        String className = command.getArgument(0);
-        String id = command.getArgument(1);
+        String className = command.getArgument(0, false);
+        String id = command.getArgument(1, false);
         Class c = Class.forName(className);
         Object obj = c.newInstance();
         server.addObject(id, obj);

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

@@ -17,8 +17,8 @@ public class ReadExecutor extends AbstractCommandExecutor {
 
     @Override
     public String run(Command command, ServerApplication server) throws Exception {
-        String id = command.getArgument(0);
-        String fieldName = command.getArgument(1);
+        String id = command.getArgument(0, false);
+        String fieldName = command.getArgument(1, false);
         String methodName = String.format("get%s%s", fieldName.substring(0, 1).toUpperCase(), fieldName.substring(1));
 
         Object obj = server.getObject(id);

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

@@ -18,10 +18,10 @@ public class WriteExecutor extends AbstractCommandExecutor {
 
     @Override
     public String run(Command command, ServerApplication server) throws Exception {
-        String id = command.getArgument(0);
-        String fieldName = command.getArgument(1);
+        String id = command.getArgument(0, false);
+        String fieldName = command.getArgument(1, false);
         String methodName = String.format("set%s%s", fieldName.substring(0, 1).toUpperCase(), fieldName.substring(1));
-        String value = command.getArgument(2);
+        String value = command.getArgument(2, false);
 
         Object obj = server.getObject(id);
         Class objClass = obj.getClass();

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

@@ -20,9 +20,11 @@ public abstract class AbstractTest {
             String res = runCommand(app, s);
             if (res != null) {
                 stringBuilder.append(res);
+                stringBuilder.append("\n");
             }
         }
-        return stringBuilder.toString();
+        String res = stringBuilder.toString();
+        return res.substring(0, res.length() - 1);
     }
 
     public ServerApplication getServer() throws Exception {

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

@@ -0,0 +1,63 @@
+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 MethodExecutorTest 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",
+                "fonction#test#getMyself#java.lang.String:a_value");
+        assertEquals("a_value", res);
+    }
+
+    @Test
+    public void test2() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "fonction#test#uselessMethod#int:42,int:24,java.lang.String:a_value");
+        assertEquals("NULL", res);
+    }
+
+    @Test
+    public void test3() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
+                "ecriture#test#privateString#some_value",
+                "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
+        assertEquals("some_value", res);
+    }
+
+    @Test
+    public void test4() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
+                "fonction#test#setPrivateString#java.lang.String:some_value",
+                "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
+        assertEquals("NULL\nsome_value", res);
+    }
+
+    @Test
+    public void test5() throws Exception
+    {
+        ServerApplication app = getServer();
+        String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
+                "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
+                "fonction#test#setPrivateString#java.lang.String:some_value",
+                "fonction#test#getPrivateString");
+        assertEquals("NULL\nsome_value", res);
+    }
+}

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

@@ -16,7 +16,7 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicInt");
-        assertEquals(res, "42");
+        assertEquals("42", res);
     }
 
     @Test
@@ -25,7 +25,7 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#privateInt");
-        assertEquals(res, "24");
+        assertEquals("24", res);
     }
 
     @Test
@@ -34,7 +34,7 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#privateString");
-        assertEquals(res, "default_value");
+        assertEquals("default_value", res);
     }
 
     @Test(expected = NoSuchMethodException.class)
@@ -59,7 +59,7 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicFloat");
-        assertEquals(res, "0.42");
+        assertEquals("0.42", res);
     }
 
     @Test
@@ -68,7 +68,7 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicDouble");
-        assertEquals(res, "0.125");
+        assertEquals("0.125", res);
     }
 
     @Test
@@ -77,6 +77,6 @@ public class ReadExecutorTest extends AbstractTest {
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicBool");
-        assertEquals(res, "true");
+        assertEquals("true", res);
     }
 }

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

@@ -43,6 +43,15 @@ public class TestDbo {
         return str;
     }
 
+    public void uselessMethod(int i, int j, String str)
+    {
+    }
+
+    public String getMyString(TestDbo dbo)
+    {
+        return dbo.getPrivateString();
+    }
+
     public String toString()
     {
         return String.format("privateString=%s, privateInt=%d, publicInt=%d, aPrivateField=%d, publicFloat=%f, publicDouble=%f, publicBool=%b",

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

@@ -20,7 +20,7 @@ public class WriteExecutorTest extends AbstractTest {
         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");
+        assertEquals("privateString=default_value, privateInt=24, publicInt=24, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
@@ -33,7 +33,7 @@ public class WriteExecutorTest extends AbstractTest {
         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");
+        assertEquals("privateString=default_value, privateInt=42, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
@@ -46,7 +46,7 @@ public class WriteExecutorTest extends AbstractTest {
         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");
+        assertEquals("privateString=a_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
@@ -59,7 +59,7 @@ public class WriteExecutorTest extends AbstractTest {
         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");
+        assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=4242.500000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
@@ -72,6 +72,6 @@ public class WriteExecutorTest extends AbstractTest {
         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");
+        assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=false", obj.toString());
     }
 }