get rid of file writing/reading

oblonski · oblonski · commit 0dd74b5bf98f · 2017-06-30T11:35:15.000+02:00
diff --git a/jsprit-io/src/test/java/com/graphhopper/jsprit/io/problem/VrpXMLWriterTest.java b/jsprit-io/src/test/java/com/graphhopper/jsprit/io/problem/VrpXMLWriterTest.java
@@ -31,13 +31,11 @@
 import com.graphhopper.jsprit.core.util.Solutions;
 import com.graphhopper.jsprit.io.util.TestUtils;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -46,34 +44,6 @@
 
 public class VrpXMLWriterTest {
 
-    private String infileName;
-
-    @Before
-    public void doBefore() {
-        infileName = "src/test/resources/infiniteWriterV2Test.xml";
-    }
-
-    @Test
-    public void whenWritingInfiniteVrp_itWritesCorrectly() {
-        VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
-        builder.setFleetSize(VehicleRoutingProblem.FleetSize.INFINITE);
-        VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("vehType").addCapacityDimension(0, 20).build();
-        VehicleImpl vehicle = VehicleImpl.Builder.newInstance("myVehicle").setStartLocation(TestUtils.loc("loc")).setType(type).build();
-        builder.addVehicle(vehicle);
-        VehicleRoutingProblem vrp = builder.build();
-        new VrpXMLWriter(vrp, null).write(infileName);
-    }
-
-    @Test
-    public void whenWritingFiniteVrp_itWritesAndReadsCorrectly() {
-        VehicleRoutingProblem.Builder builder = twoVehicleTypesAndImpls();
-        builder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE);
-
-        VehicleRoutingProblem vrp = builder.build();
-        writeAndRereadXml(vrp);
-    }
-
-
     @Test
     public void whenWritingServices_itWritesThemCorrectly() {
         VehicleRoutingProblem.Builder builder = twoVehicleTypesAndImpls();
@@ -630,28 +600,32 @@ public void outputStreamAndFileContentsAreEqual() throws IOException {
         VehicleRoutingProblem.Builder builder = twoVehicleTypesAndImpls();
         VehicleRoutingProblem vrp = builder.build();
 
-        new VrpXMLWriter(vrp, null).write(infileName);
-        String outputStringFromFile = new String(Files.readAllBytes(Paths.get(infileName)));
+        VrpXMLWriter vrpXMLWriter = new VrpXMLWriter(vrp, null);
+        ByteArrayOutputStream os = (ByteArrayOutputStream) vrpXMLWriter.write();
+
+        String outputStringFromFile = new String(os.toByteArray());
         String outputStringFromStream = new VrpXMLWriter(vrp, null).write().toString();
 
         assertEquals(outputStringFromFile, outputStringFromStream);
 
     }
 
     private VehicleRoutingProblem writeAndRereadXml(VehicleRoutingProblem vrp) {
-        new VrpXMLWriter(vrp, null).write(infileName);
-
+        VrpXMLWriter vrpXMLWriter = new VrpXMLWriter(vrp, null);
+        ByteArrayOutputStream os = (ByteArrayOutputStream) vrpXMLWriter.write();
+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
         VehicleRoutingProblem.Builder vrpToReadBuilder = VehicleRoutingProblem.Builder.newInstance();
-        new VrpXMLReader(vrpToReadBuilder, null).read(infileName);
+        new VrpXMLReader(vrpToReadBuilder, null).read(is);
         return vrpToReadBuilder.build();
     }
 
     private List<VehicleRoutingProblemSolution> writeAndRereadXmlWithSolutions(VehicleRoutingProblem vrp, List<VehicleRoutingProblemSolution> solutions) {
-        new VrpXMLWriter(vrp, solutions).write(infileName);
-
+        VrpXMLWriter vrpXMLWriter = new VrpXMLWriter(vrp, solutions);
+        ByteArrayOutputStream os = (ByteArrayOutputStream) vrpXMLWriter.write();
+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
         VehicleRoutingProblem.Builder vrpToReadBuilder = VehicleRoutingProblem.Builder.newInstance();
         List<VehicleRoutingProblemSolution> solutionsToRead = new ArrayList<VehicleRoutingProblemSolution>();
-        new VrpXMLReader(vrpToReadBuilder, solutionsToRead).read(infileName);
+        new VrpXMLReader(vrpToReadBuilder, solutionsToRead).read(is);
         return solutionsToRead;
     }
 
