Grand rework

Deploy/Prepare.ps1

@@ -1,22 +1,21 @@
-# --- INSTALLER ---
+$licenseFilePath = "$PSScriptRoot/../License.txt"
 
-# Run Inno Setup Compiler
-& "c:\Program Files (x86)\Inno Setup 5\iscc" "$PSScriptRoot\Installer\Installer.iss"
+$projectDirPath = "$PSScriptRoot/../LightBulb"
+$publishDirPath = "$PSScriptRoot/bin/build/"
+$artifactFilePath = "$PSScriptRoot/bin/LightBulb.zip"
 
-# --- PORTABLE ---
+# Prepare directory
+if (Test-Path $publishDirPath) {
+    Remove-Item $publishDirPath -Recurse -Force
+}
+New-Item $publishDirPath -ItemType Directory -Force
+
+# Build & publish
+dotnet publish $projectDirPath -o $publishDirPath -c Release | Out-Host
 
-# Get files
 $files = @()
-$files += Get-Item -Path "$PSScriptRoot\..\License.txt"
-$files += Get-ChildItem -Path "$PSScriptRoot\..\LightBulb\bin\Release\*" -Include "*.exe", "*.dll", "*.config"
-$files += Get-ChildItem -Path "$PSScriptRoot\Portable\*";
+$files += Get-Item -Path $licenseFilePath
+$files += Get-ChildItem -Path $publishDirPath
 
 # Pack into archive
-New-Item "$PSScriptRoot\Portable\bin" -ItemType Directory -Force
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\Portable\bin\LightBulb-Portable.zip" -Force
-
-# --- CHOCOLATEY ---
-
-# Create package
-New-Item "$PSScriptRoot\Choco\bin\" -ItemType Directory -Force
-choco pack $PSScriptRoot\Choco\lightbulb.nuspec --out $PSScriptRoot\Choco\bin\
+$files | Compress-Archive -DestinationPath $artifactFilePath -Force

LightBulb.Tests/Converters/TimeSpanToHumanizedDurationStringConverterTests.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using LightBulb.Converters;
+using NUnit.Framework;
+
+namespace LightBulb.Tests.Converters
+{
+    [TestFixture]
+    public class TimeSpanToHumanizedDurationStringConverterTests
+    {
+        private static IEnumerable<TestCaseData> GetTestCases_Convert()
+        {
+            yield return new TestCaseData(
+                TimeSpan.FromHours(1),
+                "1 hour",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(2),
+                "2 hours",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(1.5),
+                "1 hour 30 minutes",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(4.5),
+                "4 hours 30 minutes",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(1) + TimeSpan.FromMinutes(1),
+                "1 hour 1 minute",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(2) + TimeSpan.FromMinutes(1),
+                "2 hours 1 minute",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromHours(2) + TimeSpan.FromMinutes(10) + TimeSpan.FromSeconds(15),
+                "2 hours 10 minutes",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromSeconds(10),
+                "10 seconds",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromSeconds(1),
+                "1 second",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.FromSeconds(0),
+                "0 seconds",
+                null
+            );
+
+            yield return new TestCaseData(
+                TimeSpan.Zero,
+                "0 seconds",
+                null
+            );
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetTestCases_Convert))]
+        public void Convert_Test(TimeSpan input, string expectedOutput, CultureInfo cultureInfo)
+        {
+            // Arrange
+            var converter = new TimeSpanToHumanizedDurationStringConverter();
+
+            // Act
+            var output = converter.Convert(input, expectedOutput.GetType(), null, cultureInfo);
+
+            // Assert
+            Assert.That(output, Is.EqualTo(expectedOutput));
+        }
+    }
+}

LightBulb.Tests/Helpers/AstronomyTests.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using LightBulb.Helpers;
+using LightBulb.Models;
+using NUnit.Framework;
+
+namespace LightBulb.Tests.Helpers
+{
+    [TestFixture]
+    public class AstronomyTests
+    {
+        private static IEnumerable<TestCaseData> GetTestCases_CalculateSunrise()
+        {
+            yield return new TestCaseData(
+                new GeoLocation(40.7128, -74.0060),
+                new DateTimeOffset(2019, 10, 08, 00, 00, 00, TimeSpan.FromHours(-4)),
+                new TimeSpan(07, 01, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(40.7128, -74.0060),
+                new DateTimeOffset(2019, 10, 08, 13, 37, 59, TimeSpan.FromHours(-4)),
+                new TimeSpan(07, 01, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(55.6761, 12.5683),
+                new DateTimeOffset(2019, 10, 08, 00, 00, 00, TimeSpan.FromHours(+2)),
+                new TimeSpan(07, 27, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(55.6761, 12.5683),
+                new DateTimeOffset(2019, 10, 08, 05, 41, 01, TimeSpan.FromHours(+2)),
+                new TimeSpan(07, 27, 00)
+            );
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetTestCases_CalculateSunrise))]
+        public void CalculateSunrise_Test(GeoLocation location, DateTimeOffset instant, TimeSpan expectedSunriseTime)
+        {
+            // Act
+            var sunriseTime = Astronomy.CalculateSunrise(location, instant).TimeOfDay;
+
+            // Assert
+            Assert.That(sunriseTime, Is.EqualTo(expectedSunriseTime).Within(TimeSpan.FromMinutes(3)));
+        }
+
+        private static IEnumerable<TestCaseData> GetTestCases_CalculateSunset()
+        {
+            yield return new TestCaseData(
+                new GeoLocation(40.7128, -74.0060),
+                new DateTimeOffset(2019, 10, 08, 00, 00, 00, TimeSpan.FromHours(-4)),
+                new TimeSpan(18, 27, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(40.7128, -74.0060),
+                new DateTimeOffset(2019, 10, 08, 13, 37, 59, TimeSpan.FromHours(-4)),
+                new TimeSpan(18, 27, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(35.6762, 139.6503),
+                new DateTimeOffset(2019, 10, 08, 00, 00, 00, TimeSpan.FromHours(+9)),
+                new TimeSpan(17, 15, 00)
+            );
+
+            yield return new TestCaseData(
+                new GeoLocation(35.6762, 139.6503),
+                new DateTimeOffset(2019, 10, 08, 23, 59, 59, TimeSpan.FromHours(+9)),
+                new TimeSpan(17, 15, 00)
+            );
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetTestCases_CalculateSunset))]
+        public void CalculateSunset_Test(GeoLocation location, DateTimeOffset instant, TimeSpan expectedSunsetTime)
+        {
+            // Act
+            var sunsetTime = Astronomy.CalculateSunset(location, instant).TimeOfDay;
+
+            // Assert
+            Assert.That(sunsetTime, Is.EqualTo(expectedSunsetTime).Within(TimeSpan.FromMinutes(3)));
+        }
+    }
+}

LightBulb.Tests/LightBulb.Tests.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LightBulb\LightBulb.csproj" />
+  </ItemGroup>
+
+</Project>