From 97aa9ff3d5f7e2fc6e18abffdc743584c013cdf9 Mon Sep 17 00:00:00 2001
From: Chao Wang <chaowan@redhat.com>
Date: Fri, 17 Jan 2025 15:30:52 +0800
Subject: [PATCH] [WFCORE-7135] Remove ModuleIdentifier use in the testsuite

---
 .../src/main/java/org/jboss/byteman/ServerReloadHelper.java | 3 +--
 .../test/standalone/mgmt/api/core/ModuleInfoTestCase.java   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testsuite/shared/src/main/java/org/jboss/byteman/ServerReloadHelper.java b/testsuite/shared/src/main/java/org/jboss/byteman/ServerReloadHelper.java
index 4c3549a07e6..4fe1a6f3046 100644
--- a/testsuite/shared/src/main/java/org/jboss/byteman/ServerReloadHelper.java
+++ b/testsuite/shared/src/main/java/org/jboss/byteman/ServerReloadHelper.java
@@ -11,7 +11,6 @@
 import org.jboss.byteman.rule.helper.Helper;
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleClassLoader;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
 
 /**
@@ -64,7 +63,7 @@ private void executeOperation(Object deploymentOperations, String operation) thr
         Field instance = defaultBootModuleLoaderHolder.getDeclaredField("INSTANCE");
         instance.setAccessible(true);
         ModuleLoader loader = (ModuleLoader) instance.get(null);
-        Module module = loader.loadModule(ModuleIdentifier.fromString("org.jboss.as.deployment-scanner"));
+        Module module = loader.loadModule("org.jboss.as.deployment-scanner");
         traceln("ServerLoaderhelper", "Module " + module.toString() + " loaded.");
         ModuleClassLoader cl = module.getClassLoader();
         Class modelNodeClass = cl.loadClassLocal("org.jboss.dmr.ModelNode");
diff --git a/testsuite/standalone/src/test/java/org/wildfly/core/test/standalone/mgmt/api/core/ModuleInfoTestCase.java b/testsuite/standalone/src/test/java/org/wildfly/core/test/standalone/mgmt/api/core/ModuleInfoTestCase.java
index b4793c25ceb..1fc5740f1bb 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/core/test/standalone/mgmt/api/core/ModuleInfoTestCase.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/core/test/standalone/mgmt/api/core/ModuleInfoTestCase.java
@@ -5,6 +5,7 @@
 
 package org.wildfly.core.test.standalone.mgmt.api.core;
 
+import org.jboss.as.controller.ModuleIdentifierUtil;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.operations.common.Util;
@@ -13,7 +14,6 @@
 import org.jboss.modules.LocalModuleLoader;
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleDependencySpec;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoadException;
 import org.junit.Assert;
 import org.junit.Test;
@@ -101,7 +101,7 @@ public void testModuleInfo() throws Exception {
         }*/
 
         // load module.xml
-        ModuleIdentifier identifier = ModuleIdentifier.fromString(TARGET_MODULE_NAME + ":main");
+        String identifier = ModuleIdentifierUtil.canonicalModuleIdentifier(TARGET_MODULE_NAME + ":main");
         Module module = loadModule(identifier);
 
         // run module-info operation
@@ -147,7 +147,7 @@ public void testModuleInfo() throws Exception {
         Assert.assertTrue(module.getClassLoader().getLocalPaths().containsAll(paths));
     }
 
-    private Module loadModule(ModuleIdentifier identifier) throws IOException, ModuleLoadException {
+    private Module loadModule(String identifier) throws IOException, ModuleLoadException {
         File[] roots = new File[]{new File(LAYERS_BASE)};
         LocalModuleLoader moduleLoader = new LocalModuleLoader(roots);
         return moduleLoader.loadModule(identifier);