Added patch to CsvToXml to support cases where the RecordDelimiter is…

… the last character on the line.
jprichardson · Oct 19, 2011 · 5ef2160 · 5ef2160
1 parent 689e00e
commit 5ef2160
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/CommonLib/Data/Csv/CsvToXml.cs b/CommonLib/Data/Csv/CsvToXml.cs
@@ -74,7 +74,19 @@ public class CsvToXml
 		}
 
 		public void Convert() {
-			var tempLines = File.ReadAllLines(this.CsvFile);
+			var tempFileLines = new List<string>();
+			var sr = new StreamReader(this.CsvFile);
+			var sb = new StringBuilder(255);
+			while (!sr.EndOfStream) {
+				sb.Append(sr.ReadLine());
+				if (sb[sb.Length - 1] == this.RecordDelimiter)
+					sb.Remove(sb.Length - 1, 1);
+				tempFileLines.Add(sb.ToString());
+				sb.Clear();
+			}
+			sr.Close();
+
+			var tempLines = tempFileLines.ToArray();
 			string[] lines = null;
 			_columnNames = null;
 

diff --git a/TestCommonLib/Data/Csv/CsvToXmlTest.cs b/TestCommonLib/Data/Csv/CsvToXmlTest.cs
@@ -118,6 +118,50 @@ public void MyTestCleanup()
 			Assert.AreEqual(xml, actualXml);
 		}
 
+		[TestMethod()]
+		public void Convert2Test() {
+
+			var columnNames = "Product;Price;DateStocked;";
+			var data = "Pepsi;4.50;2010-05-04;\nCoke;3.00;2010-09-22;\nCheetos;7.25;2009-01-13;";
+
+			var csvWithColumnNamesFile = TestEnvironment.DataPath + "csv-columnNames.csv";
+			var csvFile = TestEnvironment.DataPath + "csv.csv";
+
+			File.WriteAllText(csvWithColumnNamesFile, columnNames + "\n" + data);
+			File.WriteAllText(csvFile, data);
+
+			string xmlHeader = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n";
+
+			string xmlWithColumnNames = xmlHeader +
+@"<Records>
+	<Record>
+		<Product>Pepsi</Product>
+		<Price>4.50</Price>
+		<DateStocked>2010-05-04</DateStocked>
+	</Record>
+	<Record>
+		<Product>Coke</Product>
+		<Price>3.00</Price>
+		<DateStocked>2010-09-22</DateStocked>
+	</Record>
+	<Record>
+		<Product>Cheetos</Product>
+		<Price>7.25</Price>
+		<DateStocked>2009-01-13</DateStocked>
+	</Record>
+</Records>";
+
+			var csvWithColumnNames = new CsvToXml(csvWithColumnNamesFile);
+			csvWithColumnNames.RecordDelimiter = ';'; csvWithColumnNames.TextQualifier = null;
+			csvWithColumnNames.HasColumnNames = true;
+			csvWithColumnNames.Convert();
+
+			string actualXmlWithColumnNames = csvWithColumnNames.XmlString;
+
+			Assert.AreEqual(xmlWithColumnNames, actualXmlWithColumnNames);
+
+		}
+
 		[TestMethod()]
 		public void RecordsTest() {
 			var columnNames = "'Product','Price','DateStocked'";

diff --git a/TestCommonLib/Mvvm/MessengerCenterTest.cs b/TestCommonLib/Mvvm/MessengerCenterTest.cs
@@ -34,7 +34,7 @@ public class MessengerCenterTest
 		}
 
 		[TestMethod()]
-		public void MessengerCenterTest() {
+		public void MessengerCenterObjTest() {
 			var mc = new MessengerCenter();
 
 			mc.Subscribe(this, "msg1", (msg) =>