Skip to content

Commit 959b138

Browse files
eric-milleseric-milles
committed
minor items
1 parent 05bc2c2 commit 959b138

File tree

1 file changed

+55
-57
lines changed

1 file changed

+55
-57
lines changed

‎subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy‎

Lines changed: 55 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,73 +18,68 @@
1818
*/
1919
package groovy.jmx.builder
2020

21+
import org.junit.jupiter.api.Assumptions
2122
import org.junit.jupiter.api.Test
2223

2324
import javax.management.ObjectName
2425

2526
import static groovy.test.GroovyAssert.shouldFail
2627

27-
class JmxBuilderToolsTest {
28+
final class JmxBuilderToolsTest {
2829

2930
@Test
3031
void testCapitalize() {
31-
assert JmxBuilderTools.capitalize("test") == "Test"
32+
assert JmxBuilderTools.capitalize('test') == 'Test'
3233
}
3334

3435
@Test
3536
void testUncapitalize() {
36-
assert JmxBuilderTools.uncapitalize("Test") == "test"
37-
}
38-
39-
@Test
40-
void testGetMBeanServer() {
41-
def server = JmxBuilderTools.getMBeanServer()
42-
assert server
37+
assert JmxBuilderTools.uncapitalize('Test') == 'test'
4338
}
4439

4540
@Test
4641
void testGetNormalizedType() {
47-
assert JmxBuilderTools.getNormalizedType("byte") == "byte"
48-
assert JmxBuilderTools.getNormalizedType("Byte") == "java.lang.Byte"
49-
assert JmxBuilderTools.getNormalizedType("java.lang.Byte") == "java.lang.Byte"
42+
assert JmxBuilderTools.getNormalizedType('byte') == 'byte'
43+
assert JmxBuilderTools.getNormalizedType('Byte') == 'java.lang.Byte'
44+
assert JmxBuilderTools.getNormalizedType('java.lang.Byte') == 'java.lang.Byte'
5045

51-
assert JmxBuilderTools.getNormalizedType("short") == "short"
52-
assert JmxBuilderTools.getNormalizedType("Short") == "java.lang.Short"
53-
assert JmxBuilderTools.getNormalizedType("java.lang.Short") == "java.lang.Short"
46+
assert JmxBuilderTools.getNormalizedType('short') == 'short'
47+
assert JmxBuilderTools.getNormalizedType('Short') == 'java.lang.Short'
48+
assert JmxBuilderTools.getNormalizedType('java.lang.Short') == 'java.lang.Short'
5449

55-
assert JmxBuilderTools.getNormalizedType("char") == "int"
56-
assert JmxBuilderTools.getNormalizedType("character") == "java.lang.Character"
57-
assert JmxBuilderTools.getNormalizedType("Character") == "java.lang.Character"
58-
assert JmxBuilderTools.getNormalizedType("java.lang.Character") == "java.lang.Character"
50+
assert JmxBuilderTools.getNormalizedType('char') == 'int'
51+
assert JmxBuilderTools.getNormalizedType('character') == 'java.lang.Character'
52+
assert JmxBuilderTools.getNormalizedType('Character') == 'java.lang.Character'
53+
assert JmxBuilderTools.getNormalizedType('java.lang.Character') == 'java.lang.Character'
5954

60-
assert JmxBuilderTools.getNormalizedType("int") == "int"
61-
assert JmxBuilderTools.getNormalizedType("integer") == "java.lang.Integer"
62-
assert JmxBuilderTools.getNormalizedType("Integer") == "java.lang.Integer"
63-
assert JmxBuilderTools.getNormalizedType("java.lang.Integer") == "java.lang.Integer"
55+
assert JmxBuilderTools.getNormalizedType('int') == 'int'
56+
assert JmxBuilderTools.getNormalizedType('integer') == 'java.lang.Integer'
57+
assert JmxBuilderTools.getNormalizedType('Integer') == 'java.lang.Integer'
58+
assert JmxBuilderTools.getNormalizedType('java.lang.Integer') == 'java.lang.Integer'
6459

65-
assert JmxBuilderTools.getNormalizedType("long") == "long"
66-
assert JmxBuilderTools.getNormalizedType("Long") == "java.lang.Long"
67-
assert JmxBuilderTools.getNormalizedType("java.lang.Long") == "java.lang.Long"
60+
assert JmxBuilderTools.getNormalizedType('long') == 'long'
61+
assert JmxBuilderTools.getNormalizedType('Long') == 'java.lang.Long'
62+
assert JmxBuilderTools.getNormalizedType('java.lang.Long') == 'java.lang.Long'
6863

69-
assert JmxBuilderTools.getNormalizedType("float") == "float"
70-
assert JmxBuilderTools.getNormalizedType("Float") == "java.lang.Float"
71-
assert JmxBuilderTools.getNormalizedType("java.lang.Float") == "java.lang.Float"
64+
assert JmxBuilderTools.getNormalizedType('float') == 'float'
65+
assert JmxBuilderTools.getNormalizedType('Float') == 'java.lang.Float'
66+
assert JmxBuilderTools.getNormalizedType('java.lang.Float') == 'java.lang.Float'
7267

73-
assert JmxBuilderTools.getNormalizedType("double") == "double"
74-
assert JmxBuilderTools.getNormalizedType("Double") == "java.lang.Double"
75-
assert JmxBuilderTools.getNormalizedType("java.lang.Double") == "java.lang.Double"
68+
assert JmxBuilderTools.getNormalizedType('double') == 'double'
69+
assert JmxBuilderTools.getNormalizedType('Double') == 'java.lang.Double'
70+
assert JmxBuilderTools.getNormalizedType('java.lang.Double') == 'java.lang.Double'
7671

77-
assert JmxBuilderTools.getNormalizedType("boolean") == "boolean"
78-
assert JmxBuilderTools.getNormalizedType("Boolean") == "java.lang.Boolean"
79-
assert JmxBuilderTools.getNormalizedType("java.lang.Boolean") == "java.lang.Boolean"
72+
assert JmxBuilderTools.getNormalizedType('boolean') == 'boolean'
73+
assert JmxBuilderTools.getNormalizedType('Boolean') == 'java.lang.Boolean'
74+
assert JmxBuilderTools.getNormalizedType('java.lang.Boolean') == 'java.lang.Boolean'
8075

8176
}
8277

8378
@Test
8479
void testGetDefaultObjectName() {
8580
def object = new MockManagedObject()
86-
def name = new ObjectName(JmxBuilderTools.DEFAULT_DOMAIN + ":" +
87-
"name=${object.getClass().getName()},hashCode=${object.hashCode()}")
81+
def name = new ObjectName(JmxBuilderTools.DEFAULT_DOMAIN +
82+
":name=${object.getClass().getName()},hashCode=${object.hashCode()}")
8883

8984
def result = JmxBuilderTools.getDefaultObjectName(object)
9085

@@ -109,34 +104,37 @@ class JmxBuilderToolsTest {
109104
def object = new BaseEmbeddedClass()
110105
def objName = "jmx.builder:type=ExportedObject,name=${object.class.canonicalName}@${object.hashCode()}"
111106
def metaMap = JmxMetaMapBuilder.buildObjectMapFrom(object)
112-
metaMap.server = JmxBuilderTools.getMBeanServer()
113-
assert metaMap
107+
try {
108+
metaMap.server = JmxBuilderTools.getMBeanServer()
109+
} catch (e) {
110+
Assumptions.abort(e.getMessage())
111+
}
114112

115-
def bean = JmxBuilderTools.registerMBeanFromMap("replace", metaMap);
113+
def bean = JmxBuilderTools.registerMBeanFromMap('replace', metaMap);
116114
assert bean
117115

118116
assert bean.name().toString() == objName
119117

120-
assert bean.info().getAttribute("Id").name == "Id"
121-
assert bean.info().getAttribute("Id").descriptor.getFieldValue("name") == "Id"
122-
assert bean.info().getAttribute("Id").descriptor.getFieldValue("readable")
123-
assert !bean.info().getAttribute("Id").descriptor.getFieldValue("writable")
118+
assert bean.info().getAttribute('Id').name == 'Id'
119+
assert bean.info().getAttribute('Id').descriptor.getFieldValue('name') == 'Id'
120+
assert bean.info().getAttribute('Id').descriptor.getFieldValue('readable')
121+
assert !bean.info().getAttribute('Id').descriptor.getFieldValue('writable')
124122

125-
assert bean.info().getAttribute("Location").name == "Location"
123+
assert bean.info().getAttribute('Location').name == 'Location'
126124

127-
assert bean.info().getAttribute("Name").name == "Name"
128-
assert bean.info().getAttribute("Name").descriptor.getFieldValue("name") == "Name"
129-
assert bean.info().getAttribute("Name").descriptor.getFieldValue("readable")
130-
assert !bean.info().getAttribute("Name").descriptor.getFieldValue("writable")
125+
assert bean.info().getAttribute('Name').name == 'Name'
126+
assert bean.info().getAttribute('Name').descriptor.getFieldValue('name') == 'Name'
127+
assert bean.info().getAttribute('Name').descriptor.getFieldValue('readable')
128+
assert !bean.info().getAttribute('Name').descriptor.getFieldValue('writable')
131129

132-
assert bean.info().getAttribute("Available").name == "Available"
133-
assert bean.info().getAttribute("Available").descriptor.getFieldValue("name") == "Available"
134-
assert bean.info().getAttribute("Available").descriptor.getFieldValue("readable")
135-
assert !bean.info().getAttribute("Available").descriptor.getFieldValue("writable")
130+
assert bean.info().getAttribute('Available').name == 'Available'
131+
assert bean.info().getAttribute('Available').descriptor.getFieldValue('name') == 'Available'
132+
assert bean.info().getAttribute('Available').descriptor.getFieldValue('readable')
133+
assert !bean.info().getAttribute('Available').descriptor.getFieldValue('writable')
136134

137-
assert bean.info().getOperation("doNothing")
138-
assert bean.info().getOperation("doTwoThings")
139-
assert bean.info().getOperation("doThreeThings")
140-
assert bean.info().getOperation("doThreeThings").signature.size() == 3
135+
assert bean.info().getOperation('doNothing')
136+
assert bean.info().getOperation('doTwoThings')
137+
assert bean.info().getOperation('doThreeThings')
138+
assert bean.info().getOperation('doThreeThings').signature.size() == 3
141139
}
142140
}

0 commit comments

Comments
 (0)