Skip to content

Commit 9ba5504

Browse files
HirogenHirogen
committed
path.join
1 parent 0d1c1f1 commit 9ba5504

27 files changed

Lines changed: 254 additions & 269 deletions

‎src/CsvColumnizer/CsvColumnizer.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
51
using System.Reflection;
62
using System.Runtime.Versioning;
7-
using System.Windows.Forms;
83

94
using ColumnizerLib;
105

@@ -218,7 +213,7 @@ public void Configure (ILogLineColumnizerCallback callback, string configDir)
218213

219214
public void LoadConfig (string configDir)
220215
{
221-
var configPath = Path.Combine(configDir, CONFIGFILENAME);
216+
var configPath = Path.Join(configDir, CONFIGFILENAME);
222217

223218
if (!File.Exists(configPath))
224219
{

‎src/LogExpert.Tests/CSVColumnizerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class CSVColumnizerTest
1414
public void Instantiat_CSVFile_BuildCorrectColumnizer (string filename, string[] expectedHeaders)
1515
{
1616
CsvColumnizer.CsvColumnizer csvColumnizer = new();
17-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename);
17+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, filename);
1818
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, LogExpert.PluginRegistry.PluginRegistry.Instance);
1919
reader.ReadFiles();
2020
var line = reader.GetLogLine(0);

‎src/LogExpert.Tests/ColumnizerPickerTest.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,40 @@ public class ColumnizerPickerTest
2222
[TestCase("Timestamp Columnizer", "30/08/2018 08:51:42.712 no bracket 1", "30/08/2018 08:51:42.712 no bracket 2", "30/08/2018 08:51:42.712 [TRACE] with bracket 1", "30/08/2018 08:51:42.712 [TRACE] with bracket 2", "no bracket 3")]
2323
public void FindColumnizer_ReturnCorrectColumnizer (string expectedColumnizerName, string line0, string line1, string line2, string line3, string line4)
2424
{
25-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "test");
25+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, "test");
2626

2727
Mock<IAutoLogLineColumnizerCallback> autoLogLineColumnizerCallbackMock = new();
2828

29-
autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(0)).Returns(new TestLogLine()
29+
_ = autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(0)).Returns(new TestLogLine()
3030
{
3131
FullLine = line0,
3232
LineNumber = 0
3333
});
3434

35-
autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(1)).Returns(new TestLogLine()
35+
_ = autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(1)).Returns(new TestLogLine()
3636
{
3737
FullLine = line1,
3838
LineNumber = 1
3939
});
4040

41-
autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(2)).Returns(new TestLogLine()
41+
_ = autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(2)).Returns(new TestLogLine()
4242
{
4343
FullLine = line2,
4444
LineNumber = 2
4545
});
4646

47-
autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(3)).Returns(new TestLogLine()
47+
_ = autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(3)).Returns(new TestLogLine()
4848
{
4949
FullLine = line3,
5050
LineNumber = 3
5151
});
52-
autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(4)).Returns(new TestLogLine()
52+
_ = autoLogLineColumnizerCallbackMock.Setup(a => a.GetLogLine(4)).Returns(new TestLogLine()
5353
{
5454
FullLine = line4,
5555
LineNumber = 4
5656
});
5757

58-
var result = ColumnizerPicker.FindColumnizer(path, autoLogLineColumnizerCallbackMock.Object, LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
58+
var result = ColumnizerPicker.FindColumnizer(path, autoLogLineColumnizerCallbackMock.Object, PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
5959

6060
Assert.That(result.GetName(), Is.EqualTo(expectedColumnizerName));
6161
}
@@ -66,16 +66,16 @@ public void FindColumnizer_ReturnCorrectColumnizer (string expectedColumnizerNam
6666
public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumnizer (
6767
string fileName, Type columnizerType)
6868
{
69-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
70-
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, LogExpert.PluginRegistry.PluginRegistry.Instance);
69+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, fileName);
70+
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, PluginRegistry.PluginRegistry.Instance);
7171
reader.ReadFiles();
7272

7373
Mock<ILogLineColumnizer> autoColumnizer = new();
74-
autoColumnizer.Setup(a => a.GetName()).Returns("Auto Columnizer");
74+
_ = autoColumnizer.Setup(a => a.GetName()).Returns("Auto Columnizer");
7575

7676
// TODO: When DI container is ready, we can mock this set up.
77-
LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer());
78-
var result = ColumnizerPicker.FindReplacementForAutoColumnizer(fileName, reader, autoColumnizer.Object, LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
77+
PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer());
78+
var result = ColumnizerPicker.FindReplacementForAutoColumnizer(fileName, reader, autoColumnizer.Object, PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
7979

8080
Assert.That(columnizerType, Is.EqualTo(result.GetType()));
8181
}
@@ -84,11 +84,11 @@ public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumniz
8484
public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer (
8585
string fileName, Type columnizerType)
8686
{
87-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
87+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, fileName);
8888

8989
// TODO: When DI container is ready, we can mock this set up.
90-
LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer());
91-
var result = ColumnizerPicker.DecideColumnizerByName(fileName, LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
90+
PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer());
91+
var result = ColumnizerPicker.DecideColumnizerByName(fileName, PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
9292

9393
Assert.That(columnizerType, Is.EqualTo(result.GetType()));
9494
}
@@ -98,12 +98,12 @@ public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer
9898
public void DecideColumnizerByName_ValidTextFile_ReturnCorrectColumnizer (
9999
string columnizerName, Type columnizerType)
100100
{
101-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, columnizerName);
101+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, columnizerName);
102102

103103
// TODO: When DI container is ready, we can mock this set up.
104-
LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonColumnizer.JsonColumnizer());
104+
PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonColumnizer.JsonColumnizer());
105105

106-
var result = ColumnizerPicker.DecideColumnizerByName(columnizerName, LogExpert.PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
106+
var result = ColumnizerPicker.DecideColumnizerByName(columnizerName, PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers);
107107

108108
Assert.That(columnizerType, Is.EqualTo(result.GetType()));
109109
}

‎src/LogExpert.Tests/ConfigManagerTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class ConfigManagerTest
2525
public void SetUp ()
2626
{
2727
// Create isolated test directory for each test
28-
_testDir = Path.Combine(Path.GetTempPath(), "LogExpert_Test_" + Guid.NewGuid().ToString("N"));
28+
_testDir = Path.Join(Path.GetTempPath(), "LogExpert_Test_" + Guid.NewGuid().ToString("N"));
2929
_ = Directory.CreateDirectory(_testDir);
30-
_testSettingsFile = new FileInfo(Path.Combine(_testDir, "settings.json"));
30+
_testSettingsFile = new FileInfo(Path.Join(_testDir, "settings.json"));
3131
}
3232

3333
[TearDown]

‎src/LogExpert.Tests/JsonColumnizerTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ public class JsonColumnizerTest
1212
public void GetColumnNames_HappyFile_ColumnNameMatches (string fileName, string expectedHeaders)
1313
{
1414
var jsonColumnizer = new JsonColumnizer.JsonColumnizer();
15-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
15+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, fileName);
1616
LogfileReader reader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, LogExpert.PluginRegistry.PluginRegistry.Instance);
1717
reader.ReadFiles();
1818

1919
var line = reader.GetLogLine(0);
2020
if (line != null)
2121
{
22-
jsonColumnizer.SplitLine(null, line);
22+
_ = jsonColumnizer.SplitLine(null, line);
2323
}
2424

2525
line = reader.GetLogLine(1);
2626
if (line != null)
2727
{
28-
jsonColumnizer.SplitLine(null, line);
28+
_ = jsonColumnizer.SplitLine(null, line);
2929
}
3030

3131
var columnHeaders = jsonColumnizer.GetColumnNames();

‎src/LogExpert.Tests/JsonCompactColumnizerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class JsonCompactColumnizerTest
1515
public void GetPriority_HappyFile_PriorityMatches (string fileName, Priority priority)
1616
{
1717
var jsonCompactColumnizer = new JsonColumnizer.JsonCompactColumnizer();
18-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
18+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, fileName);
1919
LogfileReader logFileReader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, LogExpert.PluginRegistry.PluginRegistry.Instance);
2020
logFileReader.ReadFiles();
2121
List<ILogLine> loglines =

‎src/LogExpert.Tests/SquareBracketColumnizerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class SquareBracketColumnizerTest
1616
public void GetPriority_HappyFile_ColumnCountMatches (string fileName, int count)
1717
{
1818
SquareBracketColumnizer squareBracketColumnizer = new();
19-
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
19+
var path = Path.Join(AppDomain.CurrentDomain.BaseDirectory, fileName);
2020

2121
LogfileReader logFileReader = new(path, new EncodingOptions(), true, 40, 50, new MultiFileOptions(), false, LogExpert.PluginRegistry.PluginRegistry.Instance);
2222
logFileReader.ReadFiles();

‎src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ private string FindFilenameForSettings (string fileName)
10861086

10871087
// handle relative paths in .lxp files
10881088
var dir = Path.GetDirectoryName(fileName);
1089-
return Path.Combine(dir, persistenceData.FileName);
1089+
return Path.Join(dir, persistenceData.FileName);
10901090
}
10911091
}
10921092

@@ -2746,15 +2746,15 @@ private void OnPluginTrustToolStripMenuItemClick (object sender, EventArgs e)
27462746
{
27472747
using var dialog = new PluginTrustDialog(this);
27482748
var result = dialog.ShowDialog();
2749-
2749+
27502750
if (result == DialogResult.OK)
27512751
{
27522752
var restartPrompt = MessageBox.Show(
27532753
"Plugin trust configuration updated.\n\nRestart LogExpert to apply changes?",
27542754
"Restart Recommended",
27552755
MessageBoxButtons.YesNo,
27562756
MessageBoxIcon.Question);
2757-
2757+
27582758
if (restartPrompt == DialogResult.Yes)
27592759
{
27602760
Application.Restart();

‎src/LogExpert.UI/Dialogs/PluginTrustDialog.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public PluginTrustDialog (Form parent)
3232

3333
Owner = parent;
3434

35-
_configPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "LogExpert", "trusted-plugins.json");
35+
_configPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "LogExpert", "trusted-plugins.json");
3636

3737
LoadConfiguration();
3838
PopulatePluginList();

‎src/LogExpert/Config/ConfigManager.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ public static ConfigManager Instance
7878
}
7979
}
8080

81-
public string ConfigDir => Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + Path.DirectorySeparatorChar + "LogExpert"; //TODO: change to Path.Combine
81+
public string ConfigDir => Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "LogExpert");
8282

8383
/// <summary>
8484
/// Application.StartUpPath + portable
8585
/// </summary>
86-
public string PortableModeDir => Application.StartupPath + Path.DirectorySeparatorChar + "portable";
86+
public string PortableModeDir => Path.Join(Application.StartupPath, "portable");
8787

8888
/// <summary>
8989
/// portableMode.json
@@ -235,7 +235,7 @@ private Settings Load ()
235235

236236
string dir;
237237

238-
if (!File.Exists(Path.Combine(PortableModeDir, PortableModeSettingsFileName)))
238+
if (!File.Exists(Path.Join(PortableModeDir, PortableModeSettingsFileName)))
239239
{
240240
_logger.Info($"### {nameof(Load)}: Load settings standard mode");
241241
dir = ConfigDir;
@@ -253,15 +253,15 @@ private Settings Load ()
253253

254254
LoadResult result;
255255

256-
if (!File.Exists(Path.Combine(dir, SETTINGS_FILE_NAME)))
256+
if (!File.Exists(Path.Join(dir, SETTINGS_FILE_NAME)))
257257
{
258258
result = LoadOrCreateNew(null);
259259
}
260260
else
261261
{
262262
try
263263
{
264-
FileInfo fileInfo = new(Path.Combine(dir, SETTINGS_FILE_NAME));
264+
FileInfo fileInfo = new(Path.Join(dir, SETTINGS_FILE_NAME));
265265
result = LoadOrCreateNew(fileInfo);
266266
}
267267
catch (IOException ex)

0 commit comments

Comments
 (0)