This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_5_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_5_0_X by this push:
new 09231f72c7 minor items
09231f72c7 is described below
commit 09231f72c79610d4d497ef079b17c7f335960685
Author: Eric Milles <[email protected]>
AuthorDate: Mon Mar 9 12:53:20 2026 -0500
minor items
---
.../groovy/jmx/builder/JmxBuilderToolsTest.groovy | 123 +++++++++++----------
1 file changed, 65 insertions(+), 58 deletions(-)
diff --git
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
index eef543bfaf..3e754f7c36 100644
---
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
+++
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
@@ -18,72 +18,75 @@
*/
package groovy.jmx.builder
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Assumptions
+import org.junit.jupiter.api.Test
import javax.management.ObjectName
-class JmxBuilderToolsTest extends GroovyTestCase {
+import static groovy.test.GroovyAssert.shouldFail
+final class JmxBuilderToolsTest {
+
+ @Test
void testCapitalize() {
- assert JmxBuilderTools.capitalize("test") == "Test"
+ assert JmxBuilderTools.capitalize('test') == 'Test'
}
+ @Test
void testUncapitalize() {
- assert JmxBuilderTools.uncapitalize("Test") == "test"
- }
-
- void testGetMBeanServer() {
- def server = JmxBuilderTools.getMBeanServer()
- assert server
+ assert JmxBuilderTools.uncapitalize('Test') == 'test'
}
+ @Test
void testGetNormalizedType() {
- assert JmxBuilderTools.getNormalizedType("byte") == "byte"
- assert JmxBuilderTools.getNormalizedType("Byte") == "java.lang.Byte"
- assert JmxBuilderTools.getNormalizedType("java.lang.Byte") ==
"java.lang.Byte"
+ assert JmxBuilderTools.getNormalizedType('byte') == 'byte'
+ assert JmxBuilderTools.getNormalizedType('Byte') == 'java.lang.Byte'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Byte') ==
'java.lang.Byte'
- assert JmxBuilderTools.getNormalizedType("short") == "short"
- assert JmxBuilderTools.getNormalizedType("Short") == "java.lang.Short"
- assert JmxBuilderTools.getNormalizedType("java.lang.Short") ==
"java.lang.Short"
+ assert JmxBuilderTools.getNormalizedType('short') == 'short'
+ assert JmxBuilderTools.getNormalizedType('Short') == 'java.lang.Short'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Short') ==
'java.lang.Short'
- assert JmxBuilderTools.getNormalizedType("char") == "int"
- assert JmxBuilderTools.getNormalizedType("character") ==
"java.lang.Character"
- assert JmxBuilderTools.getNormalizedType("Character") ==
"java.lang.Character"
- assert JmxBuilderTools.getNormalizedType("java.lang.Character") ==
"java.lang.Character"
+ assert JmxBuilderTools.getNormalizedType('char') == 'int'
+ assert JmxBuilderTools.getNormalizedType('character') ==
'java.lang.Character'
+ assert JmxBuilderTools.getNormalizedType('Character') ==
'java.lang.Character'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Character') ==
'java.lang.Character'
- assert JmxBuilderTools.getNormalizedType("int") == "int"
- assert JmxBuilderTools.getNormalizedType("integer") ==
"java.lang.Integer"
- assert JmxBuilderTools.getNormalizedType("Integer") ==
"java.lang.Integer"
- assert JmxBuilderTools.getNormalizedType("java.lang.Integer") ==
"java.lang.Integer"
+ assert JmxBuilderTools.getNormalizedType('int') == 'int'
+ assert JmxBuilderTools.getNormalizedType('integer') ==
'java.lang.Integer'
+ assert JmxBuilderTools.getNormalizedType('Integer') ==
'java.lang.Integer'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Integer') ==
'java.lang.Integer'
- assert JmxBuilderTools.getNormalizedType("long") == "long"
- assert JmxBuilderTools.getNormalizedType("Long") == "java.lang.Long"
- assert JmxBuilderTools.getNormalizedType("java.lang.Long") ==
"java.lang.Long"
+ assert JmxBuilderTools.getNormalizedType('long') == 'long'
+ assert JmxBuilderTools.getNormalizedType('Long') == 'java.lang.Long'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Long') ==
'java.lang.Long'
- assert JmxBuilderTools.getNormalizedType("float") == "float"
- assert JmxBuilderTools.getNormalizedType("Float") == "java.lang.Float"
- assert JmxBuilderTools.getNormalizedType("java.lang.Float") ==
"java.lang.Float"
+ assert JmxBuilderTools.getNormalizedType('float') == 'float'
+ assert JmxBuilderTools.getNormalizedType('Float') == 'java.lang.Float'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Float') ==
'java.lang.Float'
- assert JmxBuilderTools.getNormalizedType("double") == "double"
- assert JmxBuilderTools.getNormalizedType("Double") ==
"java.lang.Double"
- assert JmxBuilderTools.getNormalizedType("java.lang.Double") ==
"java.lang.Double"
+ assert JmxBuilderTools.getNormalizedType('double') == 'double'
+ assert JmxBuilderTools.getNormalizedType('Double') ==
'java.lang.Double'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Double') ==
'java.lang.Double'
- assert JmxBuilderTools.getNormalizedType("boolean") == "boolean"
- assert JmxBuilderTools.getNormalizedType("Boolean") ==
"java.lang.Boolean"
- assert JmxBuilderTools.getNormalizedType("java.lang.Boolean") ==
"java.lang.Boolean"
+ assert JmxBuilderTools.getNormalizedType('boolean') == 'boolean'
+ assert JmxBuilderTools.getNormalizedType('Boolean') ==
'java.lang.Boolean'
+ assert JmxBuilderTools.getNormalizedType('java.lang.Boolean') ==
'java.lang.Boolean'
}
+ @Test
void testGetDefaultObjectName() {
def object = new MockManagedObject()
- def name = new ObjectName(JmxBuilderTools.DEFAULT_DOMAIN + ":" +
-
"name=${object.getClass().getName()},hashCode=${object.hashCode()}")
+ def name = new ObjectName(JmxBuilderTools.DEFAULT_DOMAIN +
+
":name=${object.getClass().getName()},hashCode=${object.hashCode()}")
def result = JmxBuilderTools.getDefaultObjectName(object)
assert result.equals(name)
}
+ @Test
void testIsClassMBean() {
def object = new MockManagedObject()
assert !JmxBuilderTools.isClassMBean(object.getClass())
@@ -96,38 +99,42 @@ class JmxBuilderToolsTest extends GroovyTestCase {
}
}
+ @Test
void testRegisterMBeanFromMap() {
def object = new BaseEmbeddedClass()
def objName =
"jmx.builder:type=ExportedObject,name=${object.class.canonicalName}@${object.hashCode()}"
def metaMap = JmxMetaMapBuilder.buildObjectMapFrom(object)
- metaMap.server = JmxBuilderTools.getMBeanServer()
- assert metaMap
+ try {
+ metaMap.server = JmxBuilderTools.getMBeanServer()
+ } catch (e) {
+ Assumptions.abort(e.getMessage())
+ }
- def bean = JmxBuilderTools.registerMBeanFromMap("replace", metaMap);
+ def bean = JmxBuilderTools.registerMBeanFromMap('replace', metaMap);
assert bean
assert bean.name().toString() == objName
- assert bean.info().getAttribute("Id").name == "Id"
- assert bean.info().getAttribute("Id").descriptor.getFieldValue("name")
== "Id"
- assert
bean.info().getAttribute("Id").descriptor.getFieldValue("readable")
- assert
!bean.info().getAttribute("Id").descriptor.getFieldValue("writable")
+ assert bean.info().getAttribute('Id').name == 'Id'
+ assert bean.info().getAttribute('Id').descriptor.getFieldValue('name')
== 'Id'
+ assert
bean.info().getAttribute('Id').descriptor.getFieldValue('readable')
+ assert
!bean.info().getAttribute('Id').descriptor.getFieldValue('writable')
- assert bean.info().getAttribute("Location").name == "Location"
+ assert bean.info().getAttribute('Location').name == 'Location'
- assert bean.info().getAttribute("Name").name == "Name"
- assert
bean.info().getAttribute("Name").descriptor.getFieldValue("name") == "Name"
- assert
bean.info().getAttribute("Name").descriptor.getFieldValue("readable")
- assert
!bean.info().getAttribute("Name").descriptor.getFieldValue("writable")
+ assert bean.info().getAttribute('Name').name == 'Name'
+ assert
bean.info().getAttribute('Name').descriptor.getFieldValue('name') == 'Name'
+ assert
bean.info().getAttribute('Name').descriptor.getFieldValue('readable')
+ assert
!bean.info().getAttribute('Name').descriptor.getFieldValue('writable')
- assert bean.info().getAttribute("Available").name == "Available"
- assert
bean.info().getAttribute("Available").descriptor.getFieldValue("name") ==
"Available"
- assert
bean.info().getAttribute("Available").descriptor.getFieldValue("readable")
- assert
!bean.info().getAttribute("Available").descriptor.getFieldValue("writable")
+ assert bean.info().getAttribute('Available').name == 'Available'
+ assert
bean.info().getAttribute('Available').descriptor.getFieldValue('name') ==
'Available'
+ assert
bean.info().getAttribute('Available').descriptor.getFieldValue('readable')
+ assert
!bean.info().getAttribute('Available').descriptor.getFieldValue('writable')
- assert bean.info().getOperation("doNothing")
- assert bean.info().getOperation("doTwoThings")
- assert bean.info().getOperation("doThreeThings")
- assert bean.info().getOperation("doThreeThings").signature.size() == 3
+ assert bean.info().getOperation('doNothing')
+ assert bean.info().getOperation('doTwoThings')
+ assert bean.info().getOperation('doThreeThings')
+ assert bean.info().getOperation('doThreeThings').signature.size() == 3
}
-}
\ No newline at end of file
+}
