You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/27 10:49:35 UTC

[tomcat] branch 8.5.x updated: Align with 9.0.x onwards (fixes failing test)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 4f04558f14 Align with 9.0.x onwards (fixes failing test)
4f04558f14 is described below

commit 4f04558f1421cd8279b09f9571bddb30572d55ef
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 27 11:49:28 2023 +0100

    Align with 9.0.x onwards (fixes failing test)
---
 test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index b8b21b788e..f2afd93806 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -123,8 +123,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest {
 
         if (trustType.equals(TrustType.NONE)) {
             Assert.assertTrue(rc != 200);
-            Assert.assertNotNull(res);
-            Assert.assertTrue(res.toString().isEmpty());
+            Assert.assertNull(res.toString());
         } else {
             Assert.assertEquals(200, rc);
             Assert.assertEquals("OK-" + TesterSupport.ROLE, res.toString());


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org