Changed the approach for one integration test

microsoft · Dec 11, 2018 · 3fa99f8 · 3fa99f8
1 parent 686b655
commit 3fa99f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/test/Microsoft.Health.Fhir.Tests.E2E/Common/FhirClient.cs b/test/Microsoft.Health.Fhir.Tests.E2E/Common/FhirClient.cs
@@ -287,16 +287,21 @@ private async Task SetupAuthenticationAsync(TestApplication clientApplication, T
             }
         }
 
-        private void ConfigureSecuritySettings(AuthenticationScenarios scnerio)
+        private void ConfigureSecuritySettings(AuthenticationScenarios authenticationscenario)
         {
-            if (scnerio == AuthenticationScenarios.NOAUTH)
+            if (authenticationscenario == AuthenticationScenarios.NOAUTH)
             {
                 SecuritySettings = (true, null, null);
             }
 
-            if (scnerio == AuthenticationScenarios.VALIDAUTHWRONGAUTHORITY)
+            if (authenticationscenario == AuthenticationScenarios.INVALIDAUTH)
             {
-                SecuritySettings = (true, SecuritySettings.AuthorizeUrl, null);
+                SecuritySettings = (true, SecuritySettings.AuthorizeUrl, "invalidtoken");
+            }
+
+            if (authenticationscenario == AuthenticationScenarios.VALIDAUTHWRONGAUTHORITY)
+            {
+                SecuritySettings = (true, "invalidauthority", SecuritySettings.TokenUrl);
             }
         }
 

diff --git a/test/Microsoft.Health.Fhir.Tests.E2E/Rest/BasicAuthTests.cs b/test/Microsoft.Health.Fhir.Tests.E2E/Rest/BasicAuthTests.cs
@@ -144,30 +144,30 @@ public async Task WhenUpdatingAResource_GivenAUserWithUpdatePermissions_TheServe
 
         [Fact]
         [Trait(Traits.Priority, Priority.One)]
-        public async Task WhenGettingAResource_GivenAUserWithInvalidAuthToken_TheServerShouldReturnUnAuthorized()
+        public async Task WhenGettingAResource_GivenAUserWithNoAuthToken_TheServerShouldReturnUnAuthorized()
         {
-            await Client.RunAsClientApplication(TestApplications.InvalidClient, AuthenticationScenarios.INVALIDAUTH);
+            await Client.RunAsClientApplication(TestApplications.NativeClient, AuthenticationScenarios.NOAUTH);
+
             FhirException fhirException = await Assert.ThrowsAsync<FhirException>(async () => await Client.CreateAsync(Samples.GetDefaultObservation()));
             Assert.Equal(UnauthorizedMessage, fhirException.Message);
             Assert.Equal(HttpStatusCode.Unauthorized, fhirException.StatusCode);
         }
 
         [Fact]
         [Trait(Traits.Priority, Priority.One)]
-        public async Task WhenGettingAResource_GivenAUserWithValidAuthTokenWrongAuthority_TheServerShouldReturnUnAuthorized()
+        public async Task WhenGettingAResource_GivenAUserWithInvalidAuthToken_TheServerShouldReturnUnAuthorized()
         {
-            await Client.RunAsClientApplication(TestApplications.NativeClient, AuthenticationScenarios.VALIDAUTHWRONGAUTHORITY);
+            await Client.RunAsClientApplication(TestApplications.InvalidClient, AuthenticationScenarios.INVALIDAUTH);
             FhirException fhirException = await Assert.ThrowsAsync<FhirException>(async () => await Client.CreateAsync(Samples.GetDefaultObservation()));
             Assert.Equal(UnauthorizedMessage, fhirException.Message);
             Assert.Equal(HttpStatusCode.Unauthorized, fhirException.StatusCode);
         }
 
         [Fact]
         [Trait(Traits.Priority, Priority.One)]
-        public async Task WhenGettingAResource_GivenAUserWithNoAuthToken_TheServerShouldReturnUnAuthorized()
+        public async Task WhenGettingAResource_GivenAUserWithValidAuthTokenWrongAuthority_TheServerShouldReturnUnAuthorized()
         {
-            await Client.RunAsClientApplication(TestApplications.NativeClient, AuthenticationScenarios.NOAUTH);
-
+            await Client.RunAsClientApplication(TestApplications.NativeClient, AuthenticationScenarios.VALIDAUTHWRONGAUTHORITY);
             FhirException fhirException = await Assert.ThrowsAsync<FhirException>(async () => await Client.CreateAsync(Samples.GetDefaultObservation()));
             Assert.Equal(UnauthorizedMessage, fhirException.Message);
             Assert.Equal(HttpStatusCode.Unauthorized, fhirException.StatusCode);