diff --git a/UptimeSharp.Tests/AlertsTest.cs b/UptimeSharp.Tests/AlertsTest.cs index 570d3bb..17827c9 100644 --- a/UptimeSharp.Tests/AlertsTest.cs +++ b/UptimeSharp.Tests/AlertsTest.cs @@ -24,8 +24,14 @@ namespace UptimeSharp.Tests // teardown public void Dispose() { - List alerts = client.GetAlerts(); - alerts.ForEach(alert => client.DeleteAlert(alert)); + client.GetAlerts().ForEach(alert => + { + try + { + client.DeleteAlert(alert); + } + catch(UptimeSharpException e){} + }); } @@ -73,13 +79,13 @@ namespace UptimeSharp.Tests public void AddAndRetrieveSpecificAlerts() { Assert.True(client.AddAlert(AlertType.Email, "example1@ceecore.com")); - Assert.True(client.AddAlert(AlertType.Boxcar, "example@ceecore.com")); + Assert.True(client.AddAlert(AlertType.Boxcar, "example2@ceecore.com")); List alerts = client.GetAlerts(); Assert.InRange(alerts.ToArray().Length, 2, 100); - List specificAlerts = client.GetAlerts(new int[] { alerts[0].ID, alerts[1].ID }); + List specificAlerts = client.GetAlerts(new string[] { alerts[0].ID, alerts[1].ID }); Assert.Equal(2, specificAlerts.ToArray().Length); } diff --git a/UptimeSharp.sln b/UptimeSharp.sln index 05d29c6..e0e41a6 100644 --- a/UptimeSharp.sln +++ b/UptimeSharp.sln @@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UptimeSharp", "UptimeSharp\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UptimeSharp.Tests", "UptimeSharp.Tests\UptimeSharp.Tests.csproj", "{7AB536B7-1A99-44A7-B5AA-E36E9C7F09F4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{2A5CC10E-451C-4978-A9B7-9F2889A18BCF}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,10 +19,6 @@ Global {7AB536B7-1A99-44A7-B5AA-E36E9C7F09F4}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB536B7-1A99-44A7-B5AA-E36E9C7F09F4}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AB536B7-1A99-44A7-B5AA-E36E9C7F09F4}.Release|Any CPU.Build.0 = Release|Any CPU - {2A5CC10E-451C-4978-A9B7-9F2889A18BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A5CC10E-451C-4978-A9B7-9F2889A18BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A5CC10E-451C-4978-A9B7-9F2889A18BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A5CC10E-451C-4978-A9B7-9F2889A18BCF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UptimeSharp/Components/Alert.cs b/UptimeSharp/Components/Alert.cs index 1b8b57c..37ca042 100644 --- a/UptimeSharp/Components/Alert.cs +++ b/UptimeSharp/Components/Alert.cs @@ -15,7 +15,7 @@ namespace UptimeSharp /// /// Retrieve specified alert contacts by supplying IDs for them. /// - public List GetAlerts(int[] alertIDs = null) + public List GetAlerts(string[] alertIDs = null) { Parameter alerts = Parameter("alertcontacts", alertIDs != null ? string.Join("-", alertIDs) : null); @@ -28,9 +28,9 @@ namespace UptimeSharp /// /// The alertID. /// - public Alert GetAlert(int alertID) + public Alert GetAlert(string alertID) { - List alerts = GetAlerts(new int[] { alertID }); + List alerts = GetAlerts(new string[] { alertID }); return alerts.ToArray().Length > 0 ? alerts[0] : null; } @@ -74,7 +74,7 @@ namespace UptimeSharp /// /// The alert ID. /// - public bool DeleteAlert(int alertID) + public bool DeleteAlert(string alertID) { return Get("deleteAlertContact", Parameter("alertContactID", alertID)).Status; } @@ -87,7 +87,7 @@ namespace UptimeSharp /// public bool DeleteAlert(Alert alert) { - return DeleteAlert((int)alert.ID); + return DeleteAlert(alert.ID); } } } \ No newline at end of file diff --git a/UptimeSharp/Components/Monitor.cs b/UptimeSharp/Components/Monitor.cs index cff9d41..11dff91 100644 --- a/UptimeSharp/Components/Monitor.cs +++ b/UptimeSharp/Components/Monitor.cs @@ -96,7 +96,7 @@ namespace UptimeSharp /// public bool AddMonitor(string name, string uri, Type type = Type.HTTP, Subtype subtype = Subtype.Unknown, int? port = null, string keywordValue = null, KeywordType keywordType = KeywordType.Unknown, - int[] alerts = null, string HTTPUsername = null, string HTTPPassword = null) + string[] alerts = null, string HTTPUsername = null, string HTTPPassword = null) { MonitorParameters parameters = new MonitorParameters() @@ -126,11 +126,11 @@ namespace UptimeSharp /// public bool ModifyMonitor(Monitor monitor) { - List alerts = null; + List alerts = null; if (monitor.Alerts != null) { - monitor.Alerts.ForEach(item => alerts.Add((int)item.ID)); + monitor.Alerts.ForEach(item => alerts.Add(item.ID)); } MonitorParameters parameters = new MonitorParameters() diff --git a/UptimeSharp/Models/Alert.cs b/UptimeSharp/Models/Alert.cs index 72a7032..f448ef2 100644 --- a/UptimeSharp/Models/Alert.cs +++ b/UptimeSharp/Models/Alert.cs @@ -15,7 +15,7 @@ namespace UptimeSharp.Models /// The ID. /// [DataMember(Name = "id")] - public int ID { get; set; } + public string ID { get; set; } /// /// Gets or sets the alert type. diff --git a/UptimeSharp/Models/Parameters/MonitorParameters.cs b/UptimeSharp/Models/Parameters/MonitorParameters.cs index 4237db9..ad8f7ff 100644 --- a/UptimeSharp/Models/Parameters/MonitorParameters.cs +++ b/UptimeSharp/Models/Parameters/MonitorParameters.cs @@ -88,7 +88,7 @@ namespace UptimeSharp.Models /// /// The alert contacts. /// - public int[] Alerts { get; set; } + public string[] Alerts { get; set; } ///