AutoColumnize throws an Exception with multiple files if no bookmarks…

… are found zarunbal#102
miltob · Jul 24, 2019 · 110eedf · 110eedf
1 parent 720f003
commit 110eedf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/LogExpert.Tests/LogExpert.Tests.csproj b/src/LogExpert.Tests/LogExpert.Tests.csproj
@@ -104,6 +104,10 @@
       <Project>{003535ec-4186-4958-9dd9-c641f089aeed}</Project>
       <Name>JsonCompactColumnizer</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Log4jXmlColumnizer\Log4jXmlColumnizer.csproj">
+      <Project>{c41a517b-7502-4b17-9119-55d5716fad65}</Project>
+      <Name>Log4jXmlColumnizer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\LogExpert\LogExpert.csproj">
       <Project>{f0c0d370-f416-44ed-939a-b4827d15ac14}</Project>
       <Name>LogExpert</Name>

diff --git a/src/LogExpert.Tests/LogWindowTest.cs b/src/LogExpert.Tests/LogWindowTest.cs
@@ -17,5 +17,17 @@ public void Instantiate_JsonFile_BuildCorrectColumnizer(string fileName, Type co
 
             Assert.AreEqual(columnizerType, logWindow.CurrentColumnizer.GetType());
         }
+
+        [TestCase(@".\TestData\XmlTest_01.xml")]
+        public void Instantiate_AnyFile_NotCrash(string fileName)
+        {
+            PluginRegistry.GetInstance().RegisteredColumnizers.Add(new Log4jXmlColumnizer());
+
+            LogTabWindow logTabWindow = new LogTabWindow(null, 0, false);
+            LogWindow logWindow =
+                new LogWindow(logTabWindow, fileName, false, false);
+
+            Assert.True(true);
+        }
     }
 }
diff --git a/src/LogExpert.Tests/TestData/XmlTest_01.xml b/src/LogExpert.Tests/TestData/XmlTest_01.xml
@@ -0,0 +1,6 @@
+<note>
+<to>Tove</to>
+<from>Jani</from>
+<heading>Reminder</heading>
+<body>Don't forget me this weekend!</body>
+</note> 
diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs
@@ -156,6 +156,7 @@ public LogWindow(LogTabWindow parent, string fileName, bool isTempFile,
 
             Closing += LogWindow_Closing;
             Disposed += LogWindow_Disposed;
+            Load += LogWindow_Load;
 
             timeSpreadCalc = new TimeSpreadCalculator(this);
             timeSpreadingControl1.TimeSpreadCalc = timeSpreadCalc;
@@ -244,7 +245,10 @@ public LogWindow(LogTabWindow parent, string fileName, bool isTempFile,
 
             statusLineTrigger.Signal += statusLineTrigger_Signal;
             selectionChangedTrigger.Signal += selectionChangedTrigger_Signal;
+        }
 
+        private void LogWindow_Load(object sender, EventArgs e)
+        {
             PreferencesChanged(parentLogTabWin.Preferences, true, SettingsFlags.GuiOrColors);
         }