From 0c9136c065fdd346a4a7b08960a5f252f2c66a8b Mon Sep 17 00:00:00 2001 From: Stefan Seelmann Date: Sun, 2 May 2021 22:21:07 +0200 Subject: Fix assertions --- .../test/integration/ui/CertificateValidationTest.java | 14 +++++++------- .../directory/studio/test/integration/ui/GssApiTest.java | 4 ++-- .../test/integration/ui/NewConnectionWizardTest.java | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java index aefe7d6b2..c6bdd7bd3 100644 --- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java +++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java @@ -337,7 +337,7 @@ public class CertificateValidationTest extends AbstractTestBase // check the certificate, should be OK String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); } @@ -442,7 +442,7 @@ public class CertificateValidationTest extends AbstractTestBase // check trust again, now the certificate is already trusted wizardBot.activate(); String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); } @@ -475,7 +475,7 @@ public class CertificateValidationTest extends AbstractTestBase // check trust again, now the certificate is already trusted wizardBot.activate(); String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); } @@ -500,7 +500,7 @@ public class CertificateValidationTest extends AbstractTestBase // check the certificate, should be OK String result = wizardBot.clickCheckNetworkParameterButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); // enter correct authentication parameter wizardBot.clickNextButton(); @@ -509,7 +509,7 @@ public class CertificateValidationTest extends AbstractTestBase // check the certificate again, should be OK String result2 = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result2 ); + assertNull( result2, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); } @@ -779,7 +779,7 @@ public class CertificateValidationTest extends AbstractTestBase // check trust again, now the certificate is already trusted wizardBot.activate(); String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); @@ -821,7 +821,7 @@ public class CertificateValidationTest extends AbstractTestBase // check trust again, now the certificate is already trusted wizardBot.activate(); String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK, valid and trusted certificate", result ); + assertNull( result, "Expected OK, valid and trusted certificate" ); wizardBot.clickCancelButton(); diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java index f3160827b..35dc1dd1c 100644 --- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java +++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java @@ -141,7 +141,7 @@ public class GssApiTest extends AbstractTestBase // check the connection String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK", result ); + assertNull( result, "Expected OK" ); wizardBot.clickCancelButton(); } @@ -183,7 +183,7 @@ public class GssApiTest extends AbstractTestBase // check the connection String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK", result ); + assertNull( result, "Expected OK" ); wizardBot.clickCancelButton(); } diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java index 369c876c0..f60934a02 100644 --- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java +++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java @@ -348,7 +348,7 @@ public class NewConnectionWizardTest extends AbstractTestBase // click "Check Network Parameter" button String result1 = wizardBot.clickCheckNetworkParameterButton(); - assertNull( "Expected OK", result1 ); + assertNull( result1, "Expected OK" ); // enter connection parameter with IPv4 address wizardBot.typeHost( InetAddress.getByName( server.getHost() ).getHostAddress() ); @@ -356,7 +356,7 @@ public class NewConnectionWizardTest extends AbstractTestBase // click "Check Network Parameter" button String result2 = wizardBot.clickCheckNetworkParameterButton(); - assertNull( "Expected OK", result2 ); + assertNull( result2, "Expected OK" ); // // Don't know why this doesn't work with SWTBot. @@ -445,7 +445,7 @@ public class NewConnectionWizardTest extends AbstractTestBase // click "Check Network Parameter" button String result = wizardBot.clickCheckAuthenticationButton(); - assertNull( "Expected OK", result ); + assertNull( result, "Expected OK" ); wizardBot.clickCancelButton(); } -- cgit v1.2.3