Create Io.cs

tatsuyafujisaki · Jul 1, 2017 · 904c856 · 904c856
1 parent 1c09746
commit 904c856
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/OpenXmlWordHelper/Api.cs b/OpenXmlWordHelper/Api.cs
@@ -205,12 +205,13 @@ static void DeletePart<T>(WorksheetPart wp) where T : OpenXmlPart
  }
 
  // Colunn index is zero-based.
- public static void SetColumnJustification(MainDocumentPart mdp, int columnIndex, JustificationValues jv)
+ public static void SetColumnJustification(Table table, int columnIndex, JustificationValues jv)
  {
- foreach (var tr in mdp.Document.Body.GetFirstChild<Table>().Elements<TableRow>())
+ foreach (var tr in table.Elements<TableRow>())
  {
- // If columnIndex = 0, "tr.Elements<TableCell>().ToList()[columnIndex]" can be simplified to "tr.GetFirstChild<TableCell>()".
- var p = tr.Elements<TableCell>().ToList()[columnIndex].GetFirstChild<Paragraph>();
+ var tc = columnIndex == 0 ? tr.GetFirstChild<TableCell>() : tr.Elements<TableCell>().ToList()[columnIndex];
+
+ var p = tc.GetFirstChild<Paragraph>();
 
  if (p.ParagraphProperties == null)
  {

diff --git a/Test1/Io.cs b/Test1/Io.cs
@@ -0,0 +1,10 @@
+using System;
+using System.IO;
+
+namespace Test1
+{
+ static class Io
+ {
+ internal static string Desktopize(params string[] paths) => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), Path.Combine(paths));
+ }
+}
diff --git a/Test1/Test1.csproj b/Test1/Test1.csproj
@@ -61,6 +61,7 @@
  <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
+ <Compile Include="Io.cs" />
  <Compile Include="UnitTest1.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>

diff --git a/Test1/UnitTest1.cs b/Test1/UnitTest1.cs
@@ -5,12 +5,10 @@
 using OpenXmlWordHelper;
 using System;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
 namespace Test1
 {
- [SuppressMessage("ReSharper", "PossiblyMistakenUseOfParamsMethod")]
  [TestClass]
  public class UnitTest1
  {
@@ -88,8 +86,8 @@ public void TestCreateNumberingParagraphs()
  [TestMethod]
  public void TestMergeDocuments()
  {
- const string path1 = "Source1.docx";
- const string path2 = "Source2.docx";
+ var path1 = Io.Desktopize("Source1.docx");
+ var path2 = Io.Desktopize("Source2.docx");
 
  Api.MergeDocuments(path1, path2);
 
@@ -99,9 +97,9 @@ public void TestMergeDocuments()
  [TestMethod]
  public void TestMergeDocumentsToNewFile()
  {
- const string path1 = "Source1.docx";
- const string path2 = "Source2.docx";
- const string path3 = "Destination.docx";
+ var path1 = Io.Desktopize("Source1.docx");
+ var path2 = Io.Desktopize("Source2.docx");
+ var path3 = Io.Desktopize("Destination.docx");
 
  Api.MergeDocuments(path1, path2, path3);
 
@@ -111,7 +109,7 @@ public void TestMergeDocumentsToNewFile()
  [TestMethod]
  public void TestProtectWord()
  {
- const string path = @"Sample.docx";
+ var path = Io.Desktopize("Sample.docx");
 
  Api.ProtectWord(path, "dummy");
 
@@ -121,9 +119,9 @@ public void TestProtectWord()
  [TestMethod]
  public void TestSetColumnJustification()
  {
- const string path = @"Sample.docx";
+ var path = Io.Desktopize("Sample.docx");
 
- TestRunner(path, mdp => Api.SetColumnJustification(mdp, 2, JustificationValues.Right));
+ TestRunner(path, mdp => Api.SetColumnJustification(mdp.Document.Body.GetFirstChild<Table>(), 0, JustificationValues.Center));
  }
  }
 }