From 26a2a6edf5a16bde2c488d6daf889174f2b8ff58 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Sun, 2 Feb 2014 00:06:06 +0100 Subject: [PATCH] fix params bugs --- UptimeSharp.Tests/MonitorsTest.cs | 13 +------------ UptimeSharp/Models/Parameters/MonitorParameters.cs | 8 ++++---- UptimeSharp/Models/Parameters/Parameters.cs | 6 +++++- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/UptimeSharp.Tests/MonitorsTest.cs b/UptimeSharp.Tests/MonitorsTest.cs index e1d98ba..0cccde2 100644 --- a/UptimeSharp.Tests/MonitorsTest.cs +++ b/UptimeSharp.Tests/MonitorsTest.cs @@ -11,9 +11,6 @@ namespace UptimeSharp.Tests public MonitorsTest() : base() { } - public async Task Dispose() { } - - [Fact] public async void AddHTTPMonitor() { @@ -91,15 +88,7 @@ namespace UptimeSharp.Tests )); List items = await client.GetMonitors(); - Monitor monitor = null; - - items.ForEach(item => - { - if (item.Name == "test_6") - { - monitor = item; - } - }); + Monitor monitor = items.SingleOrDefault(item => item.Name == "test_6"); Assert.NotNull(monitor); diff --git a/UptimeSharp/Models/Parameters/MonitorParameters.cs b/UptimeSharp/Models/Parameters/MonitorParameters.cs index 28bbbee..e89249f 100644 --- a/UptimeSharp/Models/Parameters/MonitorParameters.cs +++ b/UptimeSharp/Models/Parameters/MonitorParameters.cs @@ -114,24 +114,24 @@ namespace UptimeSharp.Models if ((int)Type != 0) { - parameters.Add("monitorType", Type.ToString()); + parameters.Add("monitorType", ((int)Type).ToString()); } // special params for port listener if (Type == Type.Port && Subtype != Subtype.Unknown) { - parameters.Add("monitorSubType", Subtype.ToString()); + parameters.Add("monitorSubType", ((int)Subtype).ToString()); if (Subtype == Subtype.Custom && Port.HasValue) { - parameters.Add("monitorPort", Port.ToString()); + parameters.Add("monitorPort", ((int)Port).ToString()); } } // keyword listener if (Type == Type.Keyword && !String.IsNullOrEmpty(KeywordValue)) { - parameters.Add("monitorKeywordType", KeywordType.ToString()); + parameters.Add("monitorKeywordType", ((int)KeywordType).ToString()); parameters.Add("monitorKeywordValue", KeywordValue); } diff --git a/UptimeSharp/Models/Parameters/Parameters.cs b/UptimeSharp/Models/Parameters/Parameters.cs index 7fd7c1a..94c77f0 100644 --- a/UptimeSharp/Models/Parameters/Parameters.cs +++ b/UptimeSharp/Models/Parameters/Parameters.cs @@ -40,7 +40,11 @@ namespace UptimeSharp.Models } // convert array to comma-seperated list - if (value is IEnumerable && value.GetType().GetElementType() == typeof(string)) + if (value is Array && (value as Array).Length > 0) + { + value = String.Join("-", value); + } + else if (value is IEnumerable && value.GetType().GetElementType() == typeof(string)) { value = String.Join("-", ((IEnumerable)value).Cast().Select(x => x.ToString()).ToArray()); }