(tapestry-5) 02/02: TAP5-2796: fixing some failures caused by upgrading TestNG

[thiagohp]

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

thiagohp pushed a commit to branch 2796
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git

commit 7744d49dfb7681bfebed87361e98ec66ee8356f9
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Oct 26 16:45:57 2024 -0300

    TAP5-2796: fixing some failures caused by upgrading TestNG
---
 .../integration/TapestryBeanValidationIntegrationTests.java       | 4 ++--
 .../org/apache/tapestry5/integration/app1/BlockTests.groovy       | 8 ++++++--
 .../internal/services/assets/CompressionAnalyzerImplTests.groovy  | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
 
b/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
index f89eb9953..5d84b892f 100644
--- 
a/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
+++ 
b/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
@@ -1,4 +1,4 @@
-// Copyright 2009-2013 The Apache Software Foundation
+// Copyright 2009-2024 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.testng.annotations.Test;
 
-@Test(sequential = true, groups = "integration")
+@Test(singleThreaded = true, groups = "integration")
 @TapestryTestConfiguration(webAppFolder = "src/test/webapp")
 public class TapestryBeanValidationIntegrationTests extends SeleniumTestCase
 {
diff --git 
a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/BlockTests.groovy
 
b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/BlockTests.groovy
index 0673c2e71..1540ea6a0 100644
--- 
a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/BlockTests.groovy
+++ 
b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/BlockTests.groovy
@@ -36,10 +36,14 @@ class BlockTests extends App1TestCase
 
         openLinks "Empty If Demo", "Hide"
 
-        assertEquals 0, getCssCount(".header-seperator")
+        assertEqualsLocal 0, getCssCount(".header-seperator")
 
         clickAndWait "link=Show"
 
-        assertEquals 1, getCssCount(".header-seperator")
+        assertEqualsLocal 1, getCssCount(".header-seperator")
+    }
+    
+    def assertEqualsLocal(int actual, int expected) {
+        org.testng.Assert.assertEquals((int) actual, (int) expected)
     }
 }
diff --git 
a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/assets/CompressionAnalyzerImplTests.groovy
 
b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/assets/CompressionAnalyzerImplTests.groovy
index bc6cfec8e..25bb4110e 100644
--- 
a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/assets/CompressionAnalyzerImplTests.groovy
+++ 
b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/assets/CompressionAnalyzerImplTests.groovy
@@ -12,10 +12,9 @@
 
 package org.apache.tapestry5.internal.services.assets
 
-import org.testng.Assert
 import org.testng.annotations.Test
 
-class CompressionAnalyzerImplTests extends Assert  {
+class CompressionAnalyzerImplTests {
 
     @Test
     void non_match_yields_true() {
@@ -45,4 +44,8 @@ class CompressionAnalyzerImplTests extends Assert  {
 
         assertEquals true, ca.isCompressable("image/svg")
     }
+    
+    def assertEquals(boolean actual, boolean expected) {
+        return org.testng.Assert.assertEquals((boolean) actual, (boolean) 
expected);
+    }
 }