Merge branch 'develop'

src/main/java/eu/simstadt/regionchooser/RegionChooserCLI.java

@@ -19,7 +19,7 @@
 /**
  * Command Line Interface for RegionChooser. Could be useful to extract large regions on server, or automate the process
  * from batch/python scripts.
- * 
+ *
  */
 
 // Usage: region_chooser [-hlV] [-e=31467] -o=output.gml -w=polygon.wkt -i=input.
@@ -109,6 +109,7 @@ public Integer call() throws Exception {
 			logInfo("CityGML written to stdout.");
 			PrintWriter stdOut = spec.commandLine().getOut();
 			count = RegionExtractor.selectRegionDirectlyFromCityGML(wktPolygon, localCRS.toString(), stdOut, citygmls);
+			stdOut.flush(); // To make sure the footer is written too.
 		} else {
 			try (BufferedWriter gmlWriter = Files.newBufferedWriter(outputCityGML)) {
 				count = RegionExtractor.selectRegionDirectlyFromCityGML(wktPolygon, localCRS.toString(), gmlWriter,

src/test/java/eu/simstadt/regionchooser/RegionChooserCLITests.java

@@ -67,8 +67,9 @@ void testExtractRegionFromTwoCitygmls() throws IOException {
 			wkt.write(wktPolygon);
 		}
 		assertFalse(Files.exists(outGML));
-		new CommandLine(new RegionChooserCLI()).execute("--input=" + citygml1 + "," + citygml2,
-				"--output=" + outGML, "--wkt=" + inWKT, "--epsg=31463", "--local");
+		new CommandLine(new RegionChooserCLI()).execute("--input=" + citygml1 + "," + citygml2, "--output=" + outGML,
+				"--wkt=" + inWKT, "--epsg=31463", "--local");
+
 		assertTrue(Files.exists(outGML));
 		assertTrue(Files.size(outGML) > 600_000);
 		assertEquals(20, countBuildings(outGML));
@@ -123,7 +124,8 @@ void testExtractRegionWithStandardInputAndStandardOutput() throws IOException {
 		assertTrue(err.toString().contains(expectedLog), err.toString() + " should contain " + expectedLog);
 		String expectedBuilding = "uuid_0547df65-ae80-459e-bb15-c839c1a2e566";
 		assertTrue(out.toString().contains(expectedBuilding), out.toString() + " should contain " + expectedBuilding);
-		//TODO: Check if footer is here too
+		String expectedFooter = "</CityModel>";
+		assertTrue(out.toString().contains(expectedFooter), out.toString() + " should contain " + expectedFooter);
 		assertFalse(Files.exists(noOutput));
 	}