Merge pull request #495 from ThomasJClark/serialization3

Fix deserializing ProjectSettings from previous GRIP versions

Author: JLLeitschuh

core/src/main/java/edu/wpi/grip/core/serialization/Project.java

@@ -2,6 +2,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
 import edu.wpi.grip.core.*;
 import edu.wpi.grip.core.sources.CameraSource;
 import edu.wpi.grip.core.sources.ImageFileSource;
@@ -22,7 +23,7 @@ public class Project {
     @Inject
     private Pipeline pipeline;
 
-    protected final XStream xstream = new XStream();
+    protected final XStream xstream = new XStream(new PureJavaReflectionProvider());
     private Optional<File> file = Optional.empty();
 
     @Inject

core/src/test/java/edu/wpi/grip/core/serialization/ProjectTest.java

@@ -24,6 +24,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
+import static junit.framework.Assert.assertNotNull;
 import static junit.framework.TestCase.assertEquals;
 import static org.bytedeco.javacpp.opencv_core.*;
 
@@ -152,7 +153,7 @@ public void testPerformSerializedStep() throws Exception {
         serializeAndDeserialize();
 
 
-        final Step fromPipeline =  pipeline.getSteps().get(0);
+        final Step fromPipeline = pipeline.getSteps().get(0);
         InputSocket<Number> a = (InputSocket<Number>) fromPipeline.getInputSockets()[0];
         InputSocket<Number> b = (InputSocket<Number>) fromPipeline.getInputSockets()[1];
         OutputSocket<Number> sum = (OutputSocket<Number>) fromPipeline.getOutputSockets()[0];
@@ -171,7 +172,7 @@ public void testPerformSerializedPythonStepFromURL() throws Exception {
         pipeline.addStep(stepFactory.create(pythonAdditionOperationFromURL));
         serializeAndDeserialize();
 
-        final Step fromPipeline =  pipeline.getSteps().get(0);
+        final Step fromPipeline = pipeline.getSteps().get(0);
         InputSocket<Number> a = (InputSocket<Number>) fromPipeline.getInputSockets()[0];
         InputSocket<Number> b = (InputSocket<Number>) fromPipeline.getInputSockets()[1];
         OutputSocket<Number> sum = (OutputSocket<Number>) fromPipeline.getOutputSockets()[0];
@@ -191,7 +192,7 @@ public void testPerformSerializedPythonStepFromSource() throws Exception {
         pipeline.addStep(stepFactory.create(pythonAdditionOperationFromSource));
         serializeAndDeserialize();
 
-        final Step fromPipeline =  pipeline.getSteps().get(0);
+        final Step fromPipeline = pipeline.getSteps().get(0);
         InputSocket<Number> a = (InputSocket<Number>) fromPipeline.getInputSockets()[0];
         InputSocket<Number> b = (InputSocket<Number>) fromPipeline.getInputSockets()[1];
         OutputSocket<Number> sum = (OutputSocket<Number>) fromPipeline.getOutputSockets()[0];
@@ -228,7 +229,6 @@ public void testPerformSerializedPipeline() throws Exception {
         OutputSocket<Number> sum2 = (OutputSocket<Number>) step2Out.getOutputSockets()[0];
 
 
-
         a1.setValue(123);
         b1.setValue(456);
         b2.setValue(789);
@@ -250,7 +250,6 @@ public void testPerformSerializedPipelineWithMats() throws Exception {
         OutputSocket<Mat> sum = (OutputSocket<Mat>) step1.getOutputSockets()[0];
 
 
-
         a.setValue(new Mat(1, 1, CV_32F, new Scalar(1234.5)));
         b.setValue(new Mat(1, 1, CV_32F, new Scalar(6789.0)));
 
@@ -290,4 +289,18 @@ public void testSerializedProjectSettings() {
         assertEquals("Deploy address was not serialized/deserialized",
                 "roborio-191-frc.local", pipeline.getProjectSettings().getDeployAddress());
     }
+
+    @Test
+    public void testUnspecifiedProjectSettings() {
+        Reader reader = new StringReader("<grip:Pipeline>" +
+                "  <sources/>" +
+                "  <steps/>" +
+                "  <connections/>" +
+                "  <settings/>" +
+                "</grip:Pipeline>");
+
+        project.open(reader);
+
+        assertNotNull("Project setting was null", pipeline.getProjectSettings().getDeployJvmOptions());
+    }
 }