From b7cf3f6532956478387c95d76239d9e3273afa92 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 21 Sep 2018 14:15:17 -0400 Subject: [PATCH 1/2] Test and fix IrcConnectionStringBuilder --- .../Models/IrcConnectionStringBuilder.cs | 4 +-- .../Models/TestIrcConnectionStringBuilder.cs | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs diff --git a/src/Tgstation.Server.Api/Models/IrcConnectionStringBuilder.cs b/src/Tgstation.Server.Api/Models/IrcConnectionStringBuilder.cs index ba2f460d47..55df172e51 100644 --- a/src/Tgstation.Server.Api/Models/IrcConnectionStringBuilder.cs +++ b/src/Tgstation.Server.Api/Models/IrcConnectionStringBuilder.cs @@ -74,8 +74,8 @@ namespace Tgstation.Server.Api.Models if (splits.Length < 4) return; - if (Boolean.TryParse(splits[3], out var useSsl)) - UseSsl = useSsl; + if (Int32.TryParse(splits[3], out var intSsl)) + UseSsl = Convert.ToBoolean(intSsl); if (splits.Length < 5) return; diff --git a/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs b/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs new file mode 100644 index 0000000000..5c64cf6776 --- /dev/null +++ b/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs @@ -0,0 +1,28 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tgstation.Server.Api.Models.Tests +{ + [TestClass] + public sealed class TestIrcConnectionStringBuilder + { + [TestMethod] + public void TestBasicParseAndBuild() + { + const string exampleString = "server;1234;nick;1;2;asdf"; + var builder = new IrcConnectionStringBuilder(exampleString); + + Assert.IsTrue(builder.Valid); + Assert.AreEqual("server", builder.Address); + Assert.AreEqual((ushort)1234, builder.Port); + Assert.AreEqual("nick", builder.Nickname); + Assert.IsTrue(builder.UseSsl.Value); + Assert.AreEqual(IrcPasswordType.NickServ, builder.PasswordType); + Assert.AreEqual("asdf", builder.Password); + + Assert.AreEqual(exampleString, builder.ToString()); + } + } +} From 388b989a271b8fc7ea3c803368a0e79a73f0669f Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 21 Sep 2018 14:36:50 -0400 Subject: [PATCH 2/2] Version bump nuget packages --- src/Tgstation.Server.Api/Tgstation.Server.Api.csproj | 2 +- src/Tgstation.Server.Client/Tgstation.Server.Client.csproj | 2 +- .../Models/TestIrcConnectionStringBuilder.cs | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj index 744e45438e..9030def747 100644 --- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj +++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj @@ -17,7 +17,7 @@ 4.0.0.0 json web api tgstation-server tgstation ss13 byond Prototype release - 4.0.0.0-preview6005 + 4.0.0.0-preview6006 diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index 3251c49c5d..9b8921d040 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -3,7 +3,7 @@ netstandard2.0 Full - 4.0.0.0-preview9112 + 4.0.0.0-preview9113 true Cyberboss /tg/station 13 diff --git a/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs b/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs index 5c64cf6776..4eca51f170 100644 --- a/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs +++ b/tests/Tgstation.Server.Api.Tests/Models/TestIrcConnectionStringBuilder.cs @@ -1,7 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Text; namespace Tgstation.Server.Api.Models.Tests {