Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ jobs:
- name: Restore dependencies
run: dotnet restore

- name: Test
shell: bash
run: |
dotnet test --no-restore --configuration ${{ matrix.configuration }}

- name: Build
shell: bash
run: |
Expand Down
14 changes: 14 additions & 0 deletions PostCodeGUI.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostCodeSerialMonitor", "PostCodeSerialMonitor\PostCodeSerialMonitor.csproj", "{EBB8E46D-05A6-46CF-9C53-7DF64086F492}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostCodeSerialMonitor.Tests", "PostCodeSerialMonitor.Tests\PostCodeSerialMonitor.Tests.csproj", "{D629C06E-3323-47AF-83C1-B7A21D978ED2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,6 +29,18 @@ Global
{EBB8E46D-05A6-46CF-9C53-7DF64086F492}.Release|x64.Build.0 = Release|Any CPU
{EBB8E46D-05A6-46CF-9C53-7DF64086F492}.Release|x86.ActiveCfg = Release|Any CPU
{EBB8E46D-05A6-46CF-9C53-7DF64086F492}.Release|x86.Build.0 = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|x64.ActiveCfg = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|x64.Build.0 = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|x86.ActiveCfg = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Debug|x86.Build.0 = Debug|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|Any CPU.Build.0 = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|x64.ActiveCfg = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|x64.Build.0 = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|x86.ActiveCfg = Release|Any CPU
{D629C06E-3323-47AF-83C1-B7A21D978ED2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
<IsPublishable>false</IsPublishable>
</PropertyGroup>

<ItemGroup>
Expand Down
93 changes: 93 additions & 0 deletions PostCodeSerialMonitor.Tests/SemanticVersionTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
using System.Collections;
using PostCodeSerialMonitor.Models;

namespace PostCodeSerialMonitor.Tests;
public class SemanticVersionTestDataGenerator : IEnumerable<object[]>
{
private readonly List<object[]> _data = new List<object[]>
{
new object[] {"0.2.0.0", "0.2.1.0", true},
new object[] {"0.2.0.0", "0.2.10.0", true},
new object[] {"0.2.0.0", "0.2.0.1", true},
new object[] {"0.2.0.0", "0.3.0", true},
new object[] {"0.2.0.0", "0.1.99", false},
new object[] {"0.2.0.0", "0.1.33.0", false},
new object[] {"0.3.0", "0.3.1", true},
new object[] {"0.3.1.0", "0.3.11.0", true},
new object[] {"0.3.2.0", "0.3.20.0", true},
new object[] {"0.3.11.0", "0.3.1.0", false},

new object[] {"1.0.0", "1.0.1", true},
new object[] {"1.0.0", "1.1.0", true},
new object[] {"1.0.0", "2.0.0", true},
new object[] {"2.0.0", "1.9.9", false},
new object[] {"1.2.3", "1.2.4", true},
new object[] {"1.2.3", "1.3.0", true},
new object[] {"1.2.3", "2.0.0", true},
new object[] {"1.2.3", "1.2.3", false},
new object[] {"10.0.0", "9.99.99", false},
new object[] {"0.0.1", "0.0.2", true},
new object[] {"0.0.1", "0.1.0", true},
new object[] {"0.0.1", "1.0.0", true},

new object[] {"v0.2.0.0", "v0.2.1.0", true},
new object[] {"v0.2.0.0", "0.2.1.0", true},
new object[] {"0.2.0.0", "v0.2.1.0", true},
new object[] {"v1.0.0", "v1.0.1", true},
new object[] {"v1.0.0", "1.0.1", true},
new object[] {"1.0.0", "v1.0.1", true},
new object[] {"v2.3.4", "v2.3.5", true},
new object[] {"v2.3.4", "2.3.5", true},
new object[] {"2.3.4", "v2.3.5", true},
new object[] {"v10.20.30", "v10.20.31", true},
new object[] {"v10.20.30", "10.20.31", true},
new object[] {"10.20.30", "v10.20.31", true},

new object[] {"v0.0.1", "v0.0.2", true},
new object[] {"v0.0.1", "0.0.2", true},
new object[] {"0.0.1", "v0.0.2", true},
new object[] {"v1.2.3", "v1.2.3", false},
new object[] {"v1.2.3", "1.2.3", false},
new object[] {"1.2.3", "v1.2.3", false},

new object[] {"0.1.0", "v0.2.0", true},
new object[] {"v0.1.0", "0.2.0", true},
new object[] {"0.1.0.0", "v0.2.0", true},
new object[] {"v0.1.0.0", "0.2.0", true},
new object[] {"1.0.0.0", "v1.1.0", true},
new object[] {"v1.0.0.0", "1.1.0", true},

new object[] {"0.9.9.9", "v1.0.0.0", true},
new object[] {"v0.9.9.9", "1.0.0.0", true},
new object[] {"1.99.99.99", "v2.0.0.0", true},
new object[] {"v1.99.99.99", "2.0.0.0", true},
new object[] {"0.0.0.1", "v0.0.0.2", true},
new object[] {"v0.0.0.1", "0.0.0", false},
};

public IEnumerator<object[]> GetEnumerator() => _data.GetEnumerator();

IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
}

public class SemanticVersionTests
{
[Fact]
public void TestParsing()
{
Assert.Equal([0, 1, 2, 3], new SemanticVersion("v0.1.2.3").VersionParts);
Assert.Equal([0, 1, 2, 3], new SemanticVersion("0.1.2.3").VersionParts);
Assert.Equal([0, 1, 2, 0], new SemanticVersion("v0.1.2").VersionParts);
Assert.Equal([0, 1, 2, 0], new SemanticVersion("0.1.2").VersionParts);
}

[Theory]
[ClassData(typeof(SemanticVersionTestDataGenerator))]
public void TestComparison(string localVersion, string remoteVersion, bool isNewer)
{
var local = new SemanticVersion(localVersion);
var remote = new SemanticVersion(remoteVersion);

Assert.Equal(isNewer, remote > local);
}
}
14 changes: 9 additions & 5 deletions PostCodeSerialMonitor.Tests/SerialDecoderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System.Text.Json;
using Moq;

namespace PostCodeSerialMonitor.Tests;
public class TestDataGenerator : IEnumerable<object[]>
Expand Down Expand Up @@ -41,14 +42,17 @@ public SerialDecoderTests()

// Create configuration
var config = new AppConfiguration();
var options = Options.Create(config);
var optionsMonitor = new Mock<IOptionsMonitor<AppConfiguration>>();
optionsMonitor.Setup(m => m.CurrentValue).Returns(config);

// Create logger factory
var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
var loggerMeta = new Mock<ILogger<MetaDefinitionService>>().Object;
var loggerDecoder = new Mock<ILogger<SerialLineDecoder>>().Object;

// Create configuration service
var configService = new ConfigurationService(
options,
optionsMonitor.Object,
loggerFactory.CreateLogger<ConfigurationService>(),
Path.GetDirectoryName(_testDataPath) ?? "."
);
Expand All @@ -69,17 +73,17 @@ public SerialDecoderTests()
);

// Create MetaDefinitionService
var metaDefinitionService = new MetaDefinitionService(configService, metaUpdateService);
var metaDefinitionService = new MetaDefinitionService(configService, metaUpdateService, loggerMeta);
metaDefinitionService.RefreshMetaDefinitionsAsync().GetAwaiter().GetResult();

_decoder = new SerialLineDecoder(metaDefinitionService);
_decoder = new SerialLineDecoder(metaDefinitionService, loggerDecoder);
}

[Theory]
[ClassData(typeof(TestDataGenerator))]
public void TestDecoding(string input, DecodedCode expected)
{
var result = _decoder.DecodeLine(input, ConsoleType.XboxOne);
var result = _decoder.DecodeLine(input, ConsoleType.XboxOnePhat);
Assert.NotNull(result);
Assert.Equal(expected.Flavor, result.Flavor);
Assert.Equal(expected.Index, result.Index);
Expand Down
38 changes: 37 additions & 1 deletion PostCodeSerialMonitor/Assets/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions PostCodeSerialMonitor/Assets/Resources.pt-BR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@
<value>Falha ao baixar MetaDefinition de {0}</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="FailedDeserializingReleaseDefinition" xml:space="preserve">
<value>Falha ao deserializar ReleaseDefinition</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="FailedDownloadReleaseDefinition" xml:space="preserve">
<value>Falha ao baixar o último lançamento de {0}</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="DecoderIgnoringLine" xml:space="preserve">
<value>Decodificador: Ignorando linha {0}</value>
<comment>In Services/SerialLineDecoder.cs</comment>
Expand Down Expand Up @@ -225,6 +233,14 @@
<value>Falha ao ataulizar o metadata</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="NewAppReleaseAvailable" xml:space="preserve">
<value>Uma nova versão do aplicativo está disponível em {0}.</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="NewFirmwareReleaseAvailable" xml:space="preserve">
<value>Uma nova versão do firmware está disponível em {0}.</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="Error" xml:space="preserve">
<value>Erro</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
Expand Down
16 changes: 16 additions & 0 deletions PostCodeSerialMonitor/Assets/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@
<value>Failed to download MetaDefinition from {0}</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="FailedDeserializingReleaseDefinition" xml:space="preserve">
<value>Failed deserializing ReleaseDefinition</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="FailedDownloadReleaseDefinition" xml:space="preserve">
<value>Failed to download latest release from {0}</value>
<comment>In Services/MetaUpdateService.cs</comment>
</data>
<data name="DecoderIgnoringLine" xml:space="preserve">
<value>Decoder: Ignoring line {0}</value>
<comment>In Services/SerialLineDecoder.cs</comment>
Expand Down Expand Up @@ -225,6 +233,14 @@
<value>Failed to update metadata</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="NewAppReleaseAvailable" xml:space="preserve">
<value>A new app release is available at {0}.</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="NewFirmwareReleaseAvailable" xml:space="preserve">
<value>A new firmware release is available at {0}.</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
</data>
<data name="Error" xml:space="preserve">
<value>Error</value>
<comment>In ViewModels/MainWindowViewModel.cs</comment>
Expand Down
5 changes: 5 additions & 0 deletions PostCodeSerialMonitor/Models/ReleaseDefinition.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
namespace PostCodeSerialMonitor.Models;
public class ReleaseDefinition
{
public string tag_name { get; set; } = string.Empty;
}
68 changes: 68 additions & 0 deletions PostCodeSerialMonitor/Models/SemanticVersion.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;

namespace PostCodeSerialMonitor.Models;

public partial class SemanticVersion
{
public const int MIN_PARTS = 3;
public const int EXPECTED_PARTS = 4;
public string Version { get; } = string.Empty;

// Format: Major.Minor.Patch.<optional build>
public List<int> VersionParts { get; } = [];

[GeneratedRegex(@"^(?:v)?(\d+)\.(\d+)\.(\d+)\.?(\d+)?", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")]
private static partial Regex VersionPartsRegex();

public SemanticVersion(string version)
{
var match = VersionPartsRegex().Match(version);

VersionParts = match.Groups.Values
// Skip first entry (the full matched string!)
.Skip(1)
.Select(x => x.Success ? int.Parse(x.Value) : 0)
.ToList();

if (VersionParts.Count < MIN_PARTS)
{
throw new InvalidDataException("Expecting at least 3 numbers in SemanticVersion");
}

//Ignore the 'v' at the beginning of the version string
if (version.StartsWith("v"))
{
Version = version.Substring(1);
}
else
{
Version = version;
}
}

/// Override greater-than operator for SemanticVersion
public static bool operator >(SemanticVersion left, SemanticVersion right)
{
for (int i = 0; i < EXPECTED_PARTS; i++)
{
if (left.VersionParts[i] > right.VersionParts[i]) return true;
if (left.VersionParts[i] < right.VersionParts[i]) return false;
}
return false;
}

/// Override less-than operator for SemanticVersion
public static bool operator <(SemanticVersion left, SemanticVersion right)
{
for (int i = 0; i < EXPECTED_PARTS; i++)
{
if (left.VersionParts[i] < right.VersionParts[i]) return true;
if (left.VersionParts[i] > right.VersionParts[i]) return false;
}
return false;
}
}
1 change: 1 addition & 0 deletions PostCodeSerialMonitor/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static void AddCommonServices(this IServiceCollection collection)
collection.AddSingleton<MetaUpdateService>();
collection.AddSingleton<MetaDefinitionService>();
collection.AddSingleton<SerialLineDecoder>();
collection.AddSingleton<GithubUpdateService>();

// Register ViewModels
collection.AddTransient<MainWindowViewModel>();
Expand Down
Loading