From 59632ac2d24e8eddbee8fab39e31cc2cdefc445c Mon Sep 17 00:00:00 2001
From: Gama11 <jensfischer95@gmail.com>
Date: Tue, 30 Jun 2015 11:45:12 +0200
Subject: [PATCH] Unit test for csv tilemap data with trailing newlines (see
 #1550)

---
 include.xml                                  | 12 ++++++------
 tests/unit/src/flixel/tile/FlxTilemapTest.hx | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include.xml b/include.xml
index 363288268d..e46a0b4b72 100644
--- a/include.xml
+++ b/include.xml
@@ -15,12 +15,12 @@
 	<haxeflag name="--macro" value="flixel.system.macros.FlxDefines.run()" />
 	
 	<section if="setup">
-		<haxelib name="systools"/>
-		<haxelib name="flixel-addons"/>
-		<haxelib name="flixel-ui"/>
-		<haxelib name="flixel-demos"/>
-		<haxelib name="flixel-tools"/>
-		<haxelib name="flixel-templates"/>
+		<haxelib name="systools" />
+		<haxelib name="flixel-addons" />
+		<haxelib name="flixel-ui" />
+		<haxelib name="flixel-demos" />
+		<haxelib name="flixel-tools" />
+		<haxelib name="flixel-templates" />
 	</section>
 	
 	<section if="create">
diff --git a/tests/unit/src/flixel/tile/FlxTilemapTest.hx b/tests/unit/src/flixel/tile/FlxTilemapTest.hx
index dfaa2789f4..dc27d6c9cd 100644
--- a/tests/unit/src/flixel/tile/FlxTilemapTest.hx
+++ b/tests/unit/src/flixel/tile/FlxTilemapTest.hx
@@ -71,19 +71,19 @@ class FlxTilemapTest extends FlxTest
 	@Test
 	function testLoadMapFromCSVWindowsNewlines()
 	{
-		testLoadMapFromCSVWithNewline("\r\n");
+		testLoadMapFromCSVWithNewline(sampleMapString, "\r\n");
 	}
 	
 	@Test
 	function testLoadMapFromCSVUnixNewlines()
 	{
-		testLoadMapFromCSVWithNewline("\n");
+		testLoadMapFromCSVWithNewline(sampleMapString, "\n");
 	}
 	
 	@Test // #1375
 	function testLoadMapFromCSVMacNewlines()
 	{
-		testLoadMapFromCSVWithNewline("\r");
+		testLoadMapFromCSVWithNewline(sampleMapString, "\r");
 	}
 	
 	@Test // #1511
@@ -95,15 +95,20 @@ class FlxTilemapTest extends FlxTest
 	@Test  // #1546
 	function testOffMapOverlap()
 	{
-		var mapData = [[1], [0]];
-		tilemap.loadMapFrom2DArray(mapData, getBitmapData(), 8, 8);
+		tilemap.loadMapFrom2DArray([[1], [0]], getBitmapData(), 8, 8);
 		var sprite = new FlxSprite( -2, 10);
 		Assert.isFalse(tilemap.overlapsWithCallback(sprite));
 	}
 	
-	function testLoadMapFromCSVWithNewline(newlines:String)
+	@Test // #1550
+	function testLoadMapFromCSVTrailingNewline()
+	{
+		testLoadMapFromCSVWithNewline(sampleMapString + "[nl]", "\n");
+	}
+	
+	function testLoadMapFromCSVWithNewline(csv:String, newlines:String)
 	{
-		tilemap.loadMapFromCSV(sampleMapString.replace("[nl]", newlines), getBitmapData(), 8, 8);
+		tilemap.loadMapFromCSV(csv.replace("[nl]", newlines), getBitmapData(), 8, 8);
 		
 		Assert.areEqual(4, tilemap.widthInTiles);
 		Assert.areEqual(3, tilemap.heightInTiles);