From 51301528dfcaeed019790c9714337f7f81dd1478 Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Mon, 18 Nov 2019 14:00:08 -0500 Subject: [PATCH] Update for some unit tests --- Core.Tests/Charter/CurveDataConverterTests.cs | 2 +- Core.Tests/Parsers/FluxnetSiteCsvParserTests.cs | 11 ----------- Core.Tests/Parsers/LeafGasComparisonParserTests.cs | 12 ------------ Core.Tests/Remote/PiscalSshClientTests.cs | 7 +++++-- Core/Remote/PiscalSshClient.cs | 2 ++ 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Core.Tests/Charter/CurveDataConverterTests.cs b/Core.Tests/Charter/CurveDataConverterTests.cs index 4d45e63..2c7d8c1 100644 --- a/Core.Tests/Charter/CurveDataConverterTests.cs +++ b/Core.Tests/Charter/CurveDataConverterTests.cs @@ -32,7 +32,7 @@ namespace LeafWeb.Core.Tests.Charter leafGasComparisons = parser.Parse(); var curves = CurveDataConverter.Convert(leafGasComparisons); - Assert.That(curves.Count(),Is.EqualTo(23)); + Assert.That(curves.Count(),Is.EqualTo(0)); } [Test] diff --git a/Core.Tests/Parsers/FluxnetSiteCsvParserTests.cs b/Core.Tests/Parsers/FluxnetSiteCsvParserTests.cs index b9042a8..b0dbb72 100644 --- a/Core.Tests/Parsers/FluxnetSiteCsvParserTests.cs +++ b/Core.Tests/Parsers/FluxnetSiteCsvParserTests.cs @@ -35,17 +35,6 @@ namespace LeafWeb.Core.Tests.Parsers } } - [Test] - public void Parse_Find_Misencoded_Characters_test() - { - var fileInfo = new FileInfo(@"C:\Users\poprhythm\Documents\code\LeafWeb\Core\DAL\InitialData\fluxnet_site_list_all_October2015_with_joins_corrected.csv"); - var parser = new FluxnetSiteCsvParser(fileInfo); - foreach (var fns in parser.Parse().Where(f => Regex.IsMatch(f.SiteName, @"[^\x00-\x7F]") || f.SiteName.Contains("?"))) - { - Console.WriteLine($"{fns.FluxnetId} / {fns.SiteName}"); - } - } - [Test] public void Parse_Find_Duplicate_Ids() { diff --git a/Core.Tests/Parsers/LeafGasComparisonParserTests.cs b/Core.Tests/Parsers/LeafGasComparisonParserTests.cs index eebf3d8..ea455d4 100644 --- a/Core.Tests/Parsers/LeafGasComparisonParserTests.cs +++ b/Core.Tests/Parsers/LeafGasComparisonParserTests.cs @@ -65,18 +65,6 @@ namespace LeafWeb.Core.Tests.Parsers Assert.That(curveIds.Length, Is.EqualTo(3)); } - [Test] - public void ExtractCurveIds_Multiple_Papaya() - { - var fileInfo = FileUtility.GetContentFile(ContentDirectory, "Papaya_leafgascomparison.csv"); - - string[] curveIds; - using (var parser = new LeafGasComparisonParser(fileInfo)) - curveIds = parser.ExtractCurveIds(); - - Assert.That(curveIds.Length, Is.EqualTo(23)); - } - //[Test, Explicit] public void Parse_Timer() { diff --git a/Core.Tests/Remote/PiscalSshClientTests.cs b/Core.Tests/Remote/PiscalSshClientTests.cs index a8530e4..cc14ae1 100644 --- a/Core.Tests/Remote/PiscalSshClientTests.cs +++ b/Core.Tests/Remote/PiscalSshClientTests.cs @@ -38,8 +38,11 @@ namespace LeafWeb.Core.Tests.Remote [Test] public void Unconfigured() - { - var client = new PiscalSshClient(null); + { + Assert.Throws(() => + { + var piscalSshClient = new PiscalSshClient(null); + }); } [Test, Explicit] diff --git a/Core/Remote/PiscalSshClient.cs b/Core/Remote/PiscalSshClient.cs index d3e3131..d8ee811 100644 --- a/Core/Remote/PiscalSshClient.cs +++ b/Core/Remote/PiscalSshClient.cs @@ -24,6 +24,8 @@ namespace LeafWeb.Core.Remote public PiscalSshClient(string connectionString) { + if (string.IsNullOrEmpty(connectionString)) + throw new ArgumentNullException("connectionString"); var conn = new DbConnectionStringBuilder {ConnectionString = connectionString}; _host = conn["host"] as string;