[activemq-artemis] branch main updated: NO-JIRA IMprovements on CompareUpgradeTest

[clebertsuconic]

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

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 7685890574 NO-JIRA IMprovements on CompareUpgradeTest
7685890574 is described below

commit 7685890574ab5ab1df53ec7aa08a1210f837a360
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Fri Sep 15 13:39:16 2023 -0400

    NO-JIRA IMprovements on CompareUpgradeTest
---
 .../apache/activemq/artemis/utils/FileUtil.java    | 31 +++++++++-------------
 .../smoke/upgradeTest/CompareUpgradeTest.java      |  2 +-
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java
index 6aa784eee5..191bb1c362 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FileUtil.java
@@ -85,24 +85,19 @@ public class FileUtil {
    public static final void copyDirectory(final File directorySource, final 
File directoryTarget) throws Exception {
       Path sourcePath = directorySource.toPath();
       Path targetPath = directoryTarget.toPath();
+      Files.walkFileTree(sourcePath, new SimpleFileVisitor<>() {
+         @Override
+         public FileVisitResult preVisitDirectory(Path dir, 
BasicFileAttributes attrs) throws IOException {
+            Path targetDir = targetPath.resolve(sourcePath.relativize(dir));
+            Files.createDirectories(targetDir);
+            return FileVisitResult.CONTINUE;
+         }
 
-      try {
-         Files.walkFileTree(sourcePath, new SimpleFileVisitor<>() {
-            @Override
-            public FileVisitResult preVisitDirectory(Path dir, 
BasicFileAttributes attrs) throws IOException {
-               Path targetDir = targetPath.resolve(sourcePath.relativize(dir));
-               Files.createDirectories(targetDir);
-               return FileVisitResult.CONTINUE;
-            }
-
-            @Override
-            public FileVisitResult visitFile(Path file, BasicFileAttributes 
attrs) throws IOException {
-               Files.copy(file, 
targetPath.resolve(sourcePath.relativize(file)), 
StandardCopyOption.REPLACE_EXISTING);
-               return FileVisitResult.CONTINUE;
-            }
-         });
-      } catch (IOException e) {
-         e.printStackTrace();
-      }
+         @Override
+         public FileVisitResult visitFile(Path file, BasicFileAttributes 
attrs) throws IOException {
+            Files.copy(file, targetPath.resolve(sourcePath.relativize(file)), 
StandardCopyOption.REPLACE_EXISTING);
+            return FileVisitResult.CONTINUE;
+         }
+      });
    }
 }
diff --git 
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java
 
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java
index aab6270568..0ee64bdddb 100644
--- 
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java
+++ 
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/upgradeTest/CompareUpgradeTest.java
@@ -164,7 +164,7 @@ public class CompareUpgradeTest {
          while (expectedIterator.hasNext()) {
             Assert.assertTrue(upgradeIterator.hasNext());
 
-            String expectedString = 
expectedIterator.next().replace("Expected", "").trim();
+            String expectedString = expectedIterator.next().trim();
             String upgradeString = upgradeIterator.next().trim();
 
             // there's a test in this class that will use a different name ID. 
on that case we replace Expected by ""