Port the DirectoryService test fix from master branch

Author: tarekgh

src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ActiveDirectoryInterSiteTransportTests.cs

@@ -60,10 +60,14 @@ public void FindByTransportType_DomainNoDomainAssociatedWithoutName_ThrowsArgume
         [InlineData(DirectoryContextType.DirectoryServer)]
         [InlineData(DirectoryContextType.Domain)]
         [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Access to common path is denied inside App")]
-        public void FindByTransportType_InvalidContextTypeWithName_ThrowsArgumentException(DirectoryContextType type)
+        public void FindByTransportType_InvalidContextTypeWithName(DirectoryContextType type)
         {
             var context = new DirectoryContext(type, "Name");
-            AssertExtensions.Throws<ArgumentException>("context", () => ActiveDirectoryInterSiteTransport.FindByTransportType(context, ActiveDirectoryTransportType.Rpc));
+            Exception exception = Record.Exception(() => ActiveDirectoryInterSiteTransport.FindByTransportType(context, ActiveDirectoryTransportType.Rpc));
+            Assert.NotNull(exception);
+            Assert.True(exception is ArgumentException ||
+                        exception is ActiveDirectoryOperationException,
+                        $"We got unrecognized exception {exception}");
         }
 
         [Fact]

src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/DomainControllerTests.cs

@@ -31,18 +31,26 @@ public void GetDomainController_InvalidContextType_ThrowsArgumentException(Direc
         [InlineData("\0")]
         [InlineData("[")]
         [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Access to path is denied when in App container")]
-        public void GetDomainController_InvalidName_ThrowsActiveDirectoryObjectNotFoundException(string name)
+        public void GetDomainController_InvalidName(string name)
         {
             var context = new DirectoryContext(DirectoryContextType.DirectoryServer, name);
-            Assert.Throws<ActiveDirectoryObjectNotFoundException>(() => DomainController.GetDomainController(context));
+            Exception exception = Record.Exception(() => DomainController.GetDomainController(context));
+            Assert.NotNull(exception);
+            Assert.True(exception is ActiveDirectoryObjectNotFoundException ||
+                        exception is ActiveDirectoryOperationException,
+                        $"We got unrecognized exception {exception}");
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
         [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Access to path is denied when in App container")]
-        public void GetDomainController_InvalidIPV6_ThrowsActiveDirectoryObjectNotFoundException()
+        public void GetDomainController_InvalidIPV6()
         {
             var context = new DirectoryContext(DirectoryContextType.DirectoryServer, "[::1]:port");
-            Assert.Throws<ActiveDirectoryObjectNotFoundException>(() => DomainController.GetDomainController(context));
+            Exception exception = Record.Exception(() => DomainController.GetDomainController(context));
+            Assert.NotNull(exception);
+            Assert.True(exception is ActiveDirectoryObjectNotFoundException ||
+                        exception is ActiveDirectoryOperationException,
+                        $"We got unrecognized exception {exception}");
         }
 
         [Fact]

src/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ForestTests.cs

@@ -53,15 +53,23 @@ public void GetForest_NonNullNameAndNotRootedDomain_ThrowsActiveDirectoryObjectN
         [InlineData(DirectoryContextType.Forest, "\0")]
         [InlineData(DirectoryContextType.DirectoryServer, "server:port")]
         [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Not approved COM object for app")]
-        public void GetForest_NonNullNameAndNotRootedDomain_ThrowsActiveDirectoryObjectNotFoundException_NonUap(DirectoryContextType type, string name)
+        public void GetForest_NonNullNameAndNotRootedDomain_NonUap(DirectoryContextType type, string name)
         {
             var context = new DirectoryContext(type, name);
             if (!PlatformDetection.IsDomainJoinedMachine)
             {
-                Assert.Throws<ActiveDirectoryObjectNotFoundException>(() => Forest.GetForest(context));
+                Exception exception = Record.Exception(() => Forest.GetForest(context));
+                Assert.NotNull(exception);
+                Assert.True(exception is ActiveDirectoryObjectNotFoundException ||
+                            exception is ActiveDirectoryOperationException,
+                            $"We got unrecognized exception {exception}");
 
                 // The result of validation is cached, so repeat this to make sure it's cached properly.
-                Assert.Throws<ActiveDirectoryObjectNotFoundException>(() => Forest.GetForest(context));
+                exception = Record.Exception(() => Forest.GetForest(context));
+                Assert.NotNull(exception);
+                Assert.True(exception is ActiveDirectoryObjectNotFoundException ||
+                            exception is ActiveDirectoryOperationException,
+                            $"We got unrecognized exception {exception}");
             }
         }
     }