-SensorParametersInternal now has an internal constructor

-Improved integration test handling of repairing a renamed probe name -Implemented additional request engine, SetObjectPropertyParameter unit tests -XmlDoc improvements
lordmilko · Nov 20, 2017 · b0d14b8 · b0d14b8
1 parent 3985a88
commit b0d14b8
Show file tree

Hide file tree

Showing 49 changed files with 587 additions and 101 deletions.
diff --git a/PrtgAPI.Tests.IntegrationTests/Support/BasePrtgClientTest.cs b/PrtgAPI.Tests.IntegrationTests/Support/BasePrtgClientTest.cs
@@ -265,8 +265,18 @@ private static void RepairState()
             {
                 if (client.GetProbes(Property.Id, Settings.Probe).First().Name != Settings.ProbeName)
                 {
-                    Logger.Log("Restoring probe name");
-                    client.SetObjectProperty(Settings.Probe, ObjectProperty.Name, Settings.ProbeName);
+                    RestoreProbeName(client);
+                }
+                else
+                {
+                    if (client.GetProbes(Property.Name, Settings.ProbeName).Count == 0)
+                    {
+                        Logger.Log("Probe could not be retrieved by name; previous rename may have failed. Re-attempting rename");
+                        RestoreProbeName(client);
+
+                        Logger.Log("Sleeping for 30 seconds so name change can properly apply");
+                        Thread.Sleep(30000);
+                    }
                 }
             }
             catch (Exception ex)
@@ -276,6 +286,25 @@ private static void RepairState()
             }
         }
 
+        private static void RestoreProbeName(PrtgClient client)
+        {
+            Logger.Log("Restoring probe name");
+            client.SetObjectProperty(Settings.Probe, ObjectProperty.Name, Settings.ProbeName);
+
+            var probe = client.GetProbes(Property.Name, Settings.ProbeName);
+
+            if (probe.Count == 0)
+            {
+                Logger.Log("Probe name didn't stick. Restoring probe name again");
+                client.SetObjectProperty(Settings.Probe, ObjectProperty.Name, Settings.ProbeName);
+
+                probe = client.GetProbes(Property.Name, Settings.ProbeName);
+
+                if (probe.Count == 0)
+                    throw new Exception("Couldn't restore probe name");
+            }
+        }
+
         protected static void RepairConfig()
         {
             Logger.Log("Repairing config");

diff --git a/PrtgAPI.Tests.UnitTests/InfrastructureTests/PrtgClientTests.cs b/PrtgAPI.Tests.UnitTests/InfrastructureTests/PrtgClientTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -273,5 +274,39 @@ private void ExecuteFailedRequest(HttpStatusCode statusCode, string xml, string
                     Assert.Fail($"Exception did not contain expected error message. Expected: '{expectedError}'. Received: '{ex.Message}'");
             }
         }
+
+        [TestMethod]
+        [ExpectedException(typeof(TimeoutException))]
+        public void PrtgClient_HandlesTimeoutSocketException()
+        {
+            ExecuteSocketException(SocketError.TimedOut);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(WebException))]
+        public void PrtgClient_HandlesConnectionRefusedSocketException()
+        {
+            ExecuteSocketException(SocketError.ConnectionRefused);
+        }
+
+        private void ExecuteSocketException(SocketError error)
+        {
+            var ctor = typeof(SocketException).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new[]
+            {
+                typeof (int), typeof (EndPoint)
+            }, null);
+
+            var ex = (SocketException)ctor.Invoke(new object[]
+            {
+                (int) error, new IPEndPoint(new IPAddress(0x2414188f), 80)
+            });
+
+            var response = new ExceptionResponse(ex);
+            var webClient = new MockWebClient(response);
+
+            var client = new PrtgClient("prtg.example.com", "username", "1234567890", AuthMode.PassHash, webClient);
+
+            client.GetSensors();
+        }
     }
 }
diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AddNotificationTriggerTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AddNotificationTriggerTests.cs
@@ -5,7 +5,7 @@
 using PrtgAPI.Parameters;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class AddNotificationTriggerTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AddSensorTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AddSensorTests.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Parameters;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class AddSensorTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AdminToolTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AdminToolTests.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class AdminToolTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AutoDiscoverTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/AutoDiscoverTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class AutoDiscoverTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/CloneTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/CloneTests.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class CloneTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/GetSensorHistoryTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/GetSensorHistoryTests.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PrtgAPI.Tests.UnitTests.ObjectTests.TestItems;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class GetSensorHistoryTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/LogTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/LogTests.cs
@@ -6,7 +6,7 @@
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestItems;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class LogTests : StreamableObjectTests<Log, MessageItem, MessageResponse>

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/ParameterTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/ParameterTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Parameters;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class ParameterTests

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/PositionTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/PositionTests.cs
@@ -4,7 +4,7 @@
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestItems;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class PositionTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RefreshTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RefreshTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class RefreshTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RemoveTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RemoveTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class RemoveTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RenameTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/RenameTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class RenameTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SensorSettingsTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SensorSettingsTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class SensorSettingsTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/ServerStatusTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/ServerStatusTests.cs
@@ -3,7 +3,7 @@
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestItems;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class ServerStatusTests : BaseTest

diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SetNotificationTriggerTests.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SetNotificationTriggerTests.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PrtgAPI.Parameters;
 using PrtgAPI.Tests.UnitTests.ObjectTests.TestResponses;
 
-namespace PrtgAPI.Tests.UnitTests.ObjectTests.CSharp
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
 {
     [TestClass]
     public class SetNotificationTriggerTests : BaseTest

diff --git a/...Tests.UnitTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeMultipleFormattable.cs b/...Tests.UnitTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeMultipleFormattable.cs
@@ -0,0 +1,15 @@
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
+{
+    class FakeMultipleFormattable : IFormattableMultiple
+    {
+        public string GetSerializedFormat()
+        {
+            return "firstValue";
+        }
+
+        public string[] GetSerializedFormats()
+        {
+            return new[] {"firstValue", "secondValue"};
+        }
+    }
+}
diff --git a/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeObjectProperty.cs b/PrtgAPI.Tests.UnitTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeObjectProperty.cs
@@ -0,0 +1,73 @@
+using PrtgAPI.Attributes;
+
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
+{
+    enum FakeObjectProperty
+    {
+        #region SetObjectPropertyParameters
+
+        [TypeLookup(typeof(FakeSettings))]
+        NormalProperty,
+
+        [TypeLookup(typeof(FakeSettings))]
+        [System.ComponentModel.Description("missingxmlelementbuthasdescription")]
+        MissingXmlElementButHasDescription,
+
+        [TypeLookup(typeof(FakeSettings))]
+        MissingXmlElementAndDescription,
+
+        MissingTypeLookup,
+
+        [TypeLookup(typeof(FakeSettings))]
+        [SecondaryProperty(nameof(SecondaryProperty))]
+        HasSecondaryProperty,
+
+        SecondaryProperty,
+
+        [TypeLookup(typeof(FakeSettings))]
+        MissingFromTypeLookupTarget,
+
+        [TypeLookup(typeof(FakeSettings))]
+        ParentProperty,
+
+        [DependentProperty(nameof(ParentProperty), "value")]
+        ChildProperty,
+
+        [TypeLookup(typeof(FakeSettings))]
+        ParentOfWrongType,
+
+        [DependentProperty(nameof(ParentOfWrongType), true)]
+        ChildWithWrongType,
+
+        [TypeLookup(typeof(FakeSettings))]
+        ParentOfReverseDependencyMissingTypeLookup,
+
+        [DependentProperty(nameof(ParentOfReverseDependencyMissingTypeLookup), "value", true)]
+        ChildPropertyWithReverseDependencyAndIsMissingTypeLookup,
+
+        [TypeLookup(typeof(FakeSettings))]
+        ParentOfReverseDependency,
+
+        [TypeLookup(typeof(FakeSettings))]
+        [DependentProperty(nameof(ParentOfReverseDependency), "value", true)]
+        ChildPropertyWithReverseDependency,
+
+        [TypeLookup(typeof(FakeSettings))]
+        [DependentProperty(nameof(ParentOfReverseDependency), "value1", true)]
+        ChildPropertyWithReverseDependencyAndWrongValue,
+
+        [TypeLookup(typeof(FakeSettings))]
+        [DependentProperty(nameof(ChildPropertyWithReverseDependencyAndWrongValue), "blah", true)]
+        GrandChildProperty,
+
+        PropertyParameterProperty,
+
+        #endregion SetObjectPropertyParameters
+        #region DynamicPropertyTypeParser
+
+        [TypeLookup(typeof(FakeSettings))]
+        ArrayProperty
+
+        #endregion
+    }
+}
diff --git a/...itTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeSetObjectPropertyParameters.cs b/...itTests/ObjectTests/CSharp/SetObjectPropertyParameters/FakeSetObjectPropertyParameters.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Reflection;
+using PrtgAPI.Parameters;
+
+namespace PrtgAPI.Tests.UnitTests.ObjectTests
+{
+    class FakeSetObjectPropertyParameters : BaseSetObjectPropertyParameters<FakeObjectProperty>
+    {
+        private Func<Enum, PropertyInfo> getPropertyInfo;
+
+        public FakeSetObjectPropertyParameters(Func<Enum, PropertyInfo> getPropertyInfo)
+        {
+            this.getPropertyInfo = getPropertyInfo;
+        }
+
+        public void AddValue(Enum property, object value, bool disableDependentsOnNotReqiuiredValue)
+        {
+            AddTypeSafeValue(property, value, disableDependentsOnNotReqiuiredValue);
+        }
+
+        protected override PropertyInfo GetPropertyInfo(Enum property)
+        {
+            return getPropertyInfo(property);
+        }
+    }
+}