Skip to content

Commit 9f15ab7

Browse files
committed
fix: Builds
1 parent eced355 commit 9f15ab7

File tree

5 files changed

+38
-14
lines changed

5 files changed

+38
-14
lines changed

.github/workflows/macos.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ permissions:
1111
contents: read
1212
env:
1313
TEST_PROJECT_NAME: Nickvision.Desktop.Tests
14+
KEYRING_PASSWORD: "abc"
1415
jobs:
1516
build:
1617
name: "Build on macOS"
@@ -31,6 +32,12 @@ jobs:
3132
uses: actions/setup-dotnet@v5
3233
with:
3334
dotnet-version: '9.0.x'
35+
- name: "Setup Keyring"
36+
run: |
37+
sudo security create-keychain -p ${{ env.KEYRING_PASSWORD }} build.keychain
38+
sudo security default-keychain -s build.keychain
39+
sudo security unlock-keychain -p ${{ env.KEYRING_PASSWORD }} build.keychain
40+
sudo security set-key-partition-list -S apple-tool:,apple: -s -k ${{ env.KEYRING_PASSWORD }} build.keychain
3441
- name: "Restore"
3542
run: dotnet restore
3643
- name: "Build"

Nickvision.Desktop.Tests/JsonFileServiceTests.cs

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,23 @@ public sealed class JsonFileServiceTests
2222
{
2323
private static JsonFileService? _jsonFileService;
2424

25+
[ClassInitialize]
26+
public static void ClassInitialize(TestContext context)
27+
{
28+
var configPath = Path.Combine(Path.Combine(Directory.GetCurrentDirectory(), "config.json"));
29+
var configAsyncPath = Path.Combine(Path.Combine(Directory.GetCurrentDirectory(), "config-async.json"));
30+
if (File.Exists(configPath))
31+
{
32+
File.Delete(configPath);
33+
}
34+
if (File.Exists(configAsyncPath))
35+
{
36+
File.Delete(configAsyncPath);
37+
}
38+
}
39+
2540
[TestMethod]
26-
public void Case001_Initalize()
41+
public void Case001_Initialize()
2742
{
2843
_jsonFileService = new JsonFileService(Directory.GetCurrentDirectory());
2944
Assert.IsNotNull(_jsonFileService);
@@ -38,7 +53,7 @@ public void Case002_Load()
3853
Assert.IsFalse(config.DarkModeEnabled);
3954
Assert.AreEqual(900, config.WindowGeometry.Width);
4055
Assert.AreEqual(700, config.WindowGeometry.Height);
41-
Assert.IsFalse(File.Exists("config.json"));
56+
Assert.IsFalse(File.Exists(Path.Combine(Directory.GetCurrentDirectory(), "config.json")));
4257
}
4358

4459
[TestMethod]
@@ -50,7 +65,7 @@ public async Task Case003_LoadAsync()
5065
Assert.IsFalse(configAsync.DarkModeEnabled);
5166
Assert.AreEqual(900, configAsync.WindowGeometry.Width);
5267
Assert.AreEqual(700, configAsync.WindowGeometry.Height);
53-
Assert.IsFalse(File.Exists("config-async.json"));
68+
Assert.IsFalse(File.Exists(Path.Combine(Directory.GetCurrentDirectory(), "config-async.json")));
5469
}
5570

5671
[TestMethod]
@@ -61,7 +76,7 @@ public void Case004_Change()
6176
config.DarkModeEnabled = true;
6277
Assert.IsTrue(config.DarkModeEnabled);
6378
Assert.IsTrue(_jsonFileService.Save(config));
64-
Assert.IsTrue(File.Exists("config.json"));
79+
Assert.IsTrue(File.Exists(Path.Combine(Directory.GetCurrentDirectory(), "config.json")));
6580
}
6681

6782
[TestMethod]
@@ -72,7 +87,7 @@ public async Task Case005_ChangeAsync()
7287
configAsync.DarkModeEnabled = true;
7388
Assert.IsTrue(configAsync.DarkModeEnabled);
7489
Assert.IsTrue(await _jsonFileService.SaveAsync(configAsync, "config-async"));
75-
Assert.IsTrue(File.Exists("config-async.json"));
90+
Assert.IsTrue(File.Exists(Path.Combine(Directory.GetCurrentDirectory(), "config-async.json")));
7691
}
7792

7893
[TestMethod]
@@ -96,15 +111,17 @@ public async Task Case007_VerifyAsync()
96111
[TestMethod]
97112
public void Case008_Cleanup()
98113
{
99-
if (File.Exists("config.json"))
114+
var configPath = Path.Combine(Path.Combine(Directory.GetCurrentDirectory(), "config.json"));
115+
var configAsyncPath = Path.Combine(Path.Combine(Directory.GetCurrentDirectory(), "config-async.json"));
116+
if (File.Exists(configPath))
100117
{
101-
File.Delete("config.json");
118+
File.Delete(configPath);
102119
}
103-
if (File.Exists("config-async.json"))
120+
if (File.Exists(configAsyncPath))
104121
{
105-
File.Delete("config-async.json");
122+
File.Delete(configAsyncPath);
106123
}
107-
Assert.IsFalse(File.Exists("config.json"));
108-
Assert.IsFalse(File.Exists("config-async.json"));
124+
Assert.IsFalse(File.Exists(configPath));
125+
Assert.IsFalse(File.Exists(configAsyncPath));
109126
}
110127
}

Nickvision.Desktop.Tests/NotificationServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class NotificationServiceTests
1010
private static NotificationService? _notificationService;
1111

1212
[TestMethod]
13-
public void Case001_Initalize()
13+
public void Case001_Initialize()
1414
{
1515
_notificationService = new NotificationService(new AppInfo("org.nickvision.desktop.tests", "Nickvision Desktop Tests", "Desktop Tests"), "Open");
1616
Assert.IsNotNull(_notificationService);

Nickvision.Desktop.Tests/PowerServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class PowerServiceTests
88
private static PowerService? _powerService;
99

1010
[TestMethod]
11-
public void Case001_Initalize()
11+
public void Case001_Initialize()
1212
{
1313
_powerService = new PowerService();
1414
Assert.IsNotNull(_powerService);

Nickvision.Desktop.Tests/SystemSecretServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public sealed class SystemSecretServiceTests
1313
private static SystemSecretService? _secretService;
1414

1515
[TestMethod]
16-
public void Case001_Initalize()
16+
public void Case001_Initialize()
1717
{
1818
_secretService = new SystemSecretService();
1919
Assert.IsNotNull(_secretService);

0 commit comments

Comments
 (0)