Merge pull request #165 from Numpsy/path-separator-2

Avoid hard coded path separators in the SaveAndClone/FlatOpc tests

Author: tomjebo

DocumentFormat.OpenXml.Tests/FlatOpcFixture.cs

@@ -44,13 +44,13 @@ private static string TestResultsDirectory
 
         private const string DirectoryPath = "FlatOpc";
 
-        private const string DocumentPath = DirectoryPath + "\\Document.docx";
-        private const string PresentationPath = DirectoryPath + "\\Presentation.pptx";
-        private const string SpreadsheetPath = DirectoryPath + "\\Spreadsheet.xlsx";
+        private static readonly string DocumentPath = Path.Combine(DirectoryPath, "Document.docx");
+        private static readonly string PresentationPath = Path.Combine(DirectoryPath, "Presentation.pptx");
+        private static readonly string SpreadsheetPath = Path.Combine(DirectoryPath, "Spreadsheet.xlsx");
 
-        private const string DocumentClonePath = DirectoryPath + "\\Document Clone.docx";
-        private const string PresentationClonePath = DirectoryPath + "\\Presentation Clone.pptx";
-        private const string SpreadsheetClonePath = DirectoryPath + "\\Spreadsheet Clone.xlsx";
+        private static readonly string DocumentClonePath = Path.Combine(DirectoryPath, "Document Clone.docx");
+        private static readonly string PresentationClonePath = Path.Combine(DirectoryPath, "Presentation Clone.pptx");
+        private static readonly string SpreadsheetClonePath = Path.Combine(DirectoryPath, "Spreadsheet Clone.xlsx");
 
         /// <summary>
         /// Creates a new instance of this test fixture, registering our test folder

DocumentFormat.OpenXml.Tests/SaveAndCloneFixture.cs

@@ -51,11 +51,11 @@ private static string TestResultsDirectory
 
         private const string DirectoryPath = "SaveAndClone";
 
-        private const string DocumentPath = DirectoryPath + "\\Document.docx";
-        private const string PresentationPath = DirectoryPath + "\\Presentation.pptx";
-        private const string SpreadsheetPath = DirectoryPath + "\\Spreadsheet.xlsx";
+        private static readonly string DocumentPath = Path.Combine(DirectoryPath, "Document.docx");
+        private static readonly string PresentationPath = Path.Combine(DirectoryPath, "Presentation.pptx");
+        private static readonly string SpreadsheetPath = Path.Combine(DirectoryPath, "Spreadsheet.xlsx");
 
-        private const string DocPropertiesPath = DirectoryPath + "\\DocProperties.xml";
+        private static readonly string DocPropertiesPath = Path.Combine(DirectoryPath, "DocProperties.xml");
 
         /// <summary>
         /// Creates a new instance of this test fixture, registering our test folder