fix warnings by xunit (kubernetes-client#1352)

tg123 · web-flow · commit 149eea642d7f · 2023-07-30T08:02:01.000-07:00
diff --git a/tests/KubernetesClient.Tests/AuthTests.cs b/tests/KubernetesClient.Tests/AuthTests.cs
@@ -49,7 +49,7 @@ public void Anonymous()
                 var listTask = ExecuteListPods(client);
 
                 Assert.True(listTask.Response.IsSuccessStatusCode);
-                Assert.Equal(1, listTask.Body.Items.Count);
+                Assert.Single(listTask.Body.Items);
             }
 
             using (var server = new MockKubeApiServer(testOutput, cxt =>
@@ -114,7 +114,7 @@ public void BasicAuth()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -224,7 +224,7 @@ public void Cert()
 
                     Assert.True(clientCertificateValidationCalled);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -241,7 +241,7 @@ public void Cert()
 
                     Assert.True(clientCertificateValidationCalled);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -324,7 +324,7 @@ public void ExternalCertificate()
                     var client = new Kubernetes(clientConfig);
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -368,7 +368,7 @@ public void ExternalToken()
                     var client = new Kubernetes(clientConfig);
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -410,7 +410,7 @@ public void Token()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -478,7 +478,7 @@ public void Oidc()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -493,7 +493,7 @@ public void Oidc()
                     try
                     {
                         PeelAggregate(() => ExecuteListPods(client));
-                        Assert.True(false, "should not be here");
+                        Assert.Fail("should not be here");
                     }
                     catch (KubernetesClientException e)
                     {
@@ -513,7 +513,7 @@ public void Oidc()
                     try
                     {
                         PeelAggregate(() => ExecuteListPods(client));
-                        Assert.True(false, "should not be here");
+                        Assert.Fail("should not be here");
                     }
                     catch (KubernetesClientException e)
                     {
@@ -528,7 +528,7 @@ private static void ShouldThrowUnauthorized(Kubernetes client)
             try
             {
                 PeelAggregate(() => ExecuteListPods(client));
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (HttpOperationException e)
             {
diff --git a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
@@ -313,7 +313,7 @@ public void LeaderElectionThrowException()
                 return;
             }
 
-            Assert.True(false, "exception not thrown");
+            Assert.Fail("exception not thrown");
         }
 
         [Fact]
diff --git a/tests/KubernetesClient.Tests/ModelExtensionTests.cs b/tests/KubernetesClient.Tests/ModelExtensionTests.cs
@@ -82,18 +82,18 @@ public void TestMetadata()
             // test annotations and labels
             pod.SetAnnotation("x", "y");
             pod.SetLabel("a", "b");
-            Assert.Equal(1, pod.Annotations().Count);
-            Assert.Equal(1, pod.Labels().Count);
+            Assert.Single(pod.Annotations());
+            Assert.Single(pod.Labels());
             Assert.Equal("y", pod.GetAnnotation("x"));
             Assert.Equal("y", pod.Metadata.Annotations["x"]);
             Assert.Null(pod.GetAnnotation("a"));
             Assert.Equal("b", pod.GetLabel("a"));
             Assert.Equal("b", pod.Metadata.Labels["a"]);
             Assert.Null(pod.GetLabel("x"));
             pod.SetAnnotation("x", null);
-            Assert.Equal(0, pod.Annotations().Count);
+            Assert.Empty(pod.Annotations());
             pod.SetLabel("a", null);
-            Assert.Equal(0, pod.Labels().Count);
+            Assert.Empty(pod.Labels());
 
             // test finalizers
             Assert.False(pod.HasFinalizer("abc"));
@@ -153,15 +153,15 @@ public void TestReferences()
             svc.OwnerReferences()[0].Controller = true;
             Assert.Same(ownr, svc.GetController());
             Assert.Same(ownr, svc.RemoveOwnerReference(pod));
-            Assert.Equal(0, svc.OwnerReferences().Count);
+            Assert.Empty(svc.OwnerReferences());
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid(), Controller = true });
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid(), Controller = false });
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid() });
             Assert.Equal(3, svc.OwnerReferences().Count);
             Assert.NotNull(svc.RemoveOwnerReference(pod));
             Assert.Equal(2, svc.OwnerReferences().Count);
             Assert.True(svc.RemoveOwnerReferences(pod));
-            Assert.Equal(0, svc.OwnerReferences().Count);
+            Assert.Empty(svc.OwnerReferences());
         }
 
         [Fact]
diff --git a/tests/KubernetesClient.Tests/OidcAuthTests.cs b/tests/KubernetesClient.Tests/OidcAuthTests.cs
@@ -32,7 +32,7 @@ public async Task TestOidcAuth()
                 result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);
                 result.Scheme.Should().Be("Bearer");
                 result.Parameter.Should().Be(expiredIdToken);
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (KubernetesClientException e)
             {
@@ -46,7 +46,7 @@ public async Task TestOidcAuth()
                 result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);
                 result.Scheme.Should().Be("Bearer");
                 result.Parameter.Should().Be(expiredIdToken);
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (KubernetesClientException e)
             {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void Anonymous()`
`49`	`49`	`var listTask = ExecuteListPods(client);`
`50`	`50`
`51`	`51`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`52`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`52`	`+ Assert.Single(listTask.Body.Items);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`using (var server = new MockKubeApiServer(testOutput, cxt =>`
`@@ -114,7 +114,7 @@ public void BasicAuth()`
`114`	`114`
`115`	`115`	`var listTask = ExecuteListPods(client);`
`116`	`116`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`117`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`117`	`+ Assert.Single(listTask.Body.Items);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`{`
`@@ -224,7 +224,7 @@ public void Cert()`
`224`	`224`
`225`	`225`	`Assert.True(clientCertificateValidationCalled);`
`226`	`226`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`227`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`227`	`+ Assert.Single(listTask.Body.Items);`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`{`
`@@ -241,7 +241,7 @@ public void Cert()`
`241`	`241`
`242`	`242`	`Assert.True(clientCertificateValidationCalled);`
`243`	`243`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`244`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`244`	`+ Assert.Single(listTask.Body.Items);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`{`
`@@ -324,7 +324,7 @@ public void ExternalCertificate()`
`324`	`324`	`var client = new Kubernetes(clientConfig);`
`325`	`325`	`var listTask = ExecuteListPods(client);`
`326`	`326`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`327`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`327`	`+ Assert.Single(listTask.Body.Items);`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`{`
`@@ -368,7 +368,7 @@ public void ExternalToken()`
`368`	`368`	`var client = new Kubernetes(clientConfig);`
`369`	`369`	`var listTask = ExecuteListPods(client);`
`370`	`370`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`371`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`371`	`+ Assert.Single(listTask.Body.Items);`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`{`
`@@ -410,7 +410,7 @@ public void Token()`
`410`	`410`
`411`	`411`	`var listTask = ExecuteListPods(client);`
`412`	`412`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`413`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`413`	`+ Assert.Single(listTask.Body.Items);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`{`
`@@ -478,7 +478,7 @@ public void Oidc()`
`478`	`478`
`479`	`479`	`var listTask = ExecuteListPods(client);`
`480`	`480`	`Assert.True(listTask.Response.IsSuccessStatusCode);`
`481`		`- Assert.Equal(1, listTask.Body.Items.Count);`
	`481`	`+ Assert.Single(listTask.Body.Items);`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`{`
`@@ -493,7 +493,7 @@ public void Oidc()`
`493`	`493`	`try`
`494`	`494`	`{`
`495`	`495`	`PeelAggregate(() => ExecuteListPods(client));`
`496`		`- Assert.True(false, "should not be here");`
	`496`	`+ Assert.Fail("should not be here");`
`497`	`497`	`}`
`498`	`498`	`catch (KubernetesClientException e)`
`499`	`499`	`{`
`@@ -513,7 +513,7 @@ public void Oidc()`
`513`	`513`	`try`
`514`	`514`	`{`
`515`	`515`	`PeelAggregate(() => ExecuteListPods(client));`
`516`		`- Assert.True(false, "should not be here");`
	`516`	`+ Assert.Fail("should not be here");`
`517`	`517`	`}`
`518`	`518`	`catch (KubernetesClientException e)`
`519`	`519`	`{`
`@@ -528,7 +528,7 @@ private static void ShouldThrowUnauthorized(Kubernetes client)`
`528`	`528`	`try`
`529`	`529`	`{`
`530`	`530`	`PeelAggregate(() => ExecuteListPods(client));`
`531`		`- Assert.True(false, "should not be here");`
	`531`	`+ Assert.Fail("should not be here");`
`532`	`532`	`}`
`533`	`533`	`catch (HttpOperationException e)`
`534`	`534`	`{`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public void LeaderElectionThrowException()`
`313`	`313`	`return;`
`314`	`314`	`}`
`315`	`315`
`316`		`- Assert.True(false, "exception not thrown");`
	`316`	`+ Assert.Fail("exception not thrown");`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task TestOidcAuth()`
`32`	`32`	`result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);`
`33`	`33`	`result.Scheme.Should().Be("Bearer");`
`34`	`34`	`result.Parameter.Should().Be(expiredIdToken);`
`35`		`- Assert.True(false, "should not be here");`
	`35`	`+ Assert.Fail("should not be here");`
`36`	`36`	`}`
`37`	`37`	`catch (KubernetesClientException e)`
`38`	`38`	`{`
`@@ -46,7 +46,7 @@ public async Task TestOidcAuth()`
`46`	`46`	`result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);`
`47`	`47`	`result.Scheme.Should().Be("Bearer");`
`48`	`48`	`result.Parameter.Should().Be(expiredIdToken);`
`49`		`- Assert.True(false, "should not be here");`
	`49`	`+ Assert.Fail("should not be here");`
`50`	`50`	`}`
`51`	`51`	`catch (KubernetesClientException e)`
`52`	`52`	`{`