Command class; tests

client/client.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

common/common.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -11,5 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <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" />
   </component>
 </module>

common/pom.xml

@@ -10,6 +10,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -0,0 +1,84 @@
+package com.uqac.rthoni.java_rmi.common;
+
+import java.io.Serializable;
+import java.util.Vector;
+import java.util.stream.Collectors;
+
+/**
+ * Created by robin on 9/15/16.
+ */
+public class Command implements Serializable {
+    private String _commandName = "";
+    private Vector<String> _arguments = new Vector<>();
+    private transient String _result;
+
+    public Command(String commandName)
+    {
+        setCommandName(commandName);
+    }
+
+    public String toString()
+    {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(_commandName);
+        if (!_arguments.isEmpty()) {
+            stringBuilder.append("#");
+            stringBuilder.append(_arguments.stream().collect(Collectors.joining("#")));
+        }
+        return stringBuilder.toString();
+    }
+
+    public static Command fromString(String str)
+    {
+        if (str == null || str.isEmpty()) {
+            return null;
+        }
+        String[] parts = str.split("#");
+        Command command = new Command(parts[0]);
+        for (int i = 1; i < parts.length; ++i) {
+            command.addArgument(parts[i]);
+        }
+        return command;
+    }
+
+    public void setCommandName(String commandName)
+    {
+        if (commandName == null || commandName.isEmpty()) {
+            commandName = "Unknown";
+        }
+        _commandName = commandName;
+    }
+
+    public String getCommandName()
+    {
+        return _commandName;
+    }
+
+    public void addArgument(String argument)
+    {
+        if (argument == null) {
+            argument = "";
+        }
+        _arguments.add(argument);
+    }
+
+    public int getArgumentCount()
+    {
+        return _arguments.size();
+    }
+
+    public String getArgument(int i)
+    {
+        return _arguments.get(i);
+    }
+
+    public void setResult(String result)
+    {
+        _result = result;
+    }
+
+    public String getResult()
+    {
+        return _result;
+    }
+}

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

@@ -0,0 +1,112 @@
+package com.uqac.rthoni.java_rmi.common;
+
+import com.sun.corba.se.impl.orbutil.ObjectWriter;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by robin on 9/15/16.
+ */
+public class CommandTest {
+
+    private String commandToString(Command command) throws Exception
+    {
+//        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+//        ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+//        objectOutputStream.writeObject(command);
+//        objectOutputStream.close();
+//        return byteArrayOutputStream.toString("UTF-8");
+        return command.toString();
+    }
+
+    @Test
+    public void testCommandSerializeNull() throws Exception
+    {
+        Command c = new Command(null);
+        String result = commandToString(c);
+        assertEquals(result, "Unknown");
+    }
+
+    @Test
+    public void testCommandSerializeEmpty() throws Exception
+    {
+        Command c = new Command("");
+        String result = commandToString(c);
+        assertEquals(result, "Unknown");
+    }
+
+    @Test
+    public void testCommandSerializeName() throws Exception
+    {
+        Command c = new Command("Test");
+        String result = commandToString(c);
+        assertEquals(result, "Test");
+    }
+
+    @Test
+    public void testCommandSerializeArgument() throws Exception
+    {
+        Command c = new Command("Test");
+        c.addArgument("an_argument");
+        String result = commandToString(c);
+        assertEquals(result, "Test#an_argument");
+    }
+
+    @Test
+    public void testCommandSerializeArguments() throws Exception
+    {
+        Command c = new Command("Test");
+        c.addArgument("an_argument");
+        c.addArgument("an_argument2");
+        String result = commandToString(c);
+        assertEquals(result, "Test#an_argument#an_argument2");
+    }
+
+    @Test
+    public void testCommandDeserializeNull() throws Exception
+    {
+        Command c = Command.fromString(null);
+        assertNull(c);
+    }
+
+    @Test
+    public void testCommandDeserializeEmpty() throws Exception
+    {
+        Command c = Command.fromString("");
+        assertNull(c);
+    }
+
+    @Test
+    public void testCommandDeserializeName() throws Exception
+    {
+        Command c = Command.fromString("Test");
+        assertNotNull(c);
+        assertEquals(c.getCommandName(), "Test");
+        assertEquals(c.getArgumentCount(), 0);
+    }
+
+    @Test
+    public void testCommandDeserializeArgument() throws Exception
+    {
+        Command c = Command.fromString("Test#an_argument");
+        assertNotNull(c);
+        assertEquals(c.getCommandName(), "Test");
+        assertEquals(c.getArgumentCount(), 1);
+        assertEquals(c.getArgument(0), "an_argument");
+    }
+
+    @Test
+    public void testCommandDeserializeArguments() throws Exception
+    {
+        Command c = Command.fromString("Test#an_argument#an_argument2");
+        assertNotNull(c);
+        assertEquals(c.getCommandName(), "Test");
+        assertEquals(c.getArgumentCount(), 2);
+        assertEquals(c.getArgument(0), "an_argument");
+        assertEquals(c.getArgument(1), "an_argument2");
+    }
+}

server/server.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

uqac-java-rmi.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">