--- old/application/org.openjdk.jmc.browser/build.properties 2019-02-27 20:12:22.000000000 +0100
+++ new/application/org.openjdk.jmc.browser/build.properties 2019-02-27 20:12:22.000000000 +0100
@@ -41,4 +41,3 @@
contexts.xml,\
appicons/
pde.match.rule.bundle=compatible
-javacDefaultEncoding.. = UTF-8
--- old/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/ChartToolTipProvider.java 2019-02-27 20:12:22.000000000 +0100
+++ new/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/ChartToolTipProvider.java 2019-02-27 20:12:22.000000000 +0100
@@ -134,7 +134,7 @@
}
protected void appendTitle(String title) {
- text.append("
").append(title).append("
");
+ text.append("").append(title).append("
"); //$NON-NLS-1$ //$NON-NLS-2$
}
protected void appendAtIfNew(IDisplayable newAt) {
--- old/application/tests/org.openjdk.jmc.flightrecorder.ui.test/src/test/java/org/openjdk/jmc/flightrecorder/ui/scripts/TokenizerTest.java 2019-02-27 20:12:23.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.flightrecorder.ui.test/src/test/java/org/openjdk/jmc/flightrecorder/ui/scripts/TokenizerTest.java 2019-02-27 20:12:23.000000000 +0100
@@ -44,31 +44,31 @@
public class TokenizerTest {
@Test
public void testQuotedString() {
- Tokenizer tokenizer = new Tokenizer("my text \"is such a nice text\""); //$NON-NLS-1$
+ Tokenizer tokenizer = new Tokenizer("my text \"is such a nice text\"");
Iterator tokenIter = tokenizer.iterator();
Token token = tokenIter.next();
- assertEquals("my", token.getText()); //$NON-NLS-1$
+ assertEquals("my", token.getText());
token = tokenIter.next();
- assertEquals("text", token.getText()); //$NON-NLS-1$
+ assertEquals("text", token.getText());
token = tokenIter.next();
- assertEquals("is such a nice text", token.getText()); //$NON-NLS-1$
+ assertEquals("is such a nice text", token.getText());
assertEquals(true, token.isInQuotes());
}
@Test
public void testMultipleRows() {
- Tokenizer tokenizer = new Tokenizer("row1;row2;row3"); //$NON-NLS-1$
+ Tokenizer tokenizer = new Tokenizer("row1;row2;row3");
Iterator tokenIter = tokenizer.iterator();
Token token = tokenIter.next();
- assertEquals("row1", token.getText()); //$NON-NLS-1$
+ assertEquals("row1", token.getText());
assertEquals(0, token.getRow());
tokenIter.next();
token = tokenIter.next();
- assertEquals("row2", token.getText()); //$NON-NLS-1$
+ assertEquals("row2", token.getText());
assertEquals(1, token.getRow());
tokenIter.next();
token = tokenIter.next();
- assertEquals("row3", token.getText()); //$NON-NLS-1$
+ assertEquals("row3", token.getText());
assertEquals(2, token.getRow());
}
}
--- old/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/GreyChartPanelTester.java 2019-02-27 20:12:24.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/GreyChartPanelTester.java 2019-02-27 20:12:24.000000000 +0100
@@ -52,7 +52,7 @@
* Little test program creating a graph containing a huge amount of data.
*/
public class GreyChartPanelTester {
- private static final SimpleDateFormat FORMATTER = new SimpleDateFormat("HH:mm:ss"); //$NON-NLS-1$
+ private static final SimpleDateFormat FORMATTER = new SimpleDateFormat("HH:mm:ss");
/**
* Program entry point.
@@ -73,7 +73,7 @@
@Override
public String getUnitString(Number min, Number max) {
- return ""; //$NON-NLS-1$
+ return "";
}
});
@@ -90,11 +90,11 @@
// ((DefaultXYLineRenderer) graph.getSeriesPlotRenderer()).setMode(DefaultXYLineRenderer.RENDERING_MODE_AVERAGING);
GreyChartPanel panel = new GreyChartPanel(graph);
- panel.setName(" graph with lot's of entries"); //$NON-NLS-1$
+ panel.setName(" graph with lot's of entries");
panel.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
- System.out.println("Changed structure!"); //$NON-NLS-1$
+ System.out.println("Changed structure!");
provider.sendNotification();
}
});
--- old/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/PieChartTester.java 2019-02-27 20:12:25.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/PieChartTester.java 2019-02-27 20:12:24.000000000 +0100
@@ -56,7 +56,7 @@
*/
@Override
public void mouseClicked(MouseEvent e) {
- System.out.println("Adding value!"); //$NON-NLS-1$
+ System.out.println("Adding value!");
}
/**
@@ -64,7 +64,7 @@
*/
@Override
public void mouseEntered(MouseEvent e) {
- System.out.println("Entered graph!"); //$NON-NLS-1$
+ System.out.println("Entered graph!");
}
/**
@@ -72,7 +72,7 @@
*/
@Override
public void mouseExited(MouseEvent e) {
- System.out.println("Exited graph!"); //$NON-NLS-1$
+ System.out.println("Exited graph!");
}
}
@@ -88,11 +88,11 @@
addNumberSeries(graph, seriesProvider, 40);
addNumberSeries(graph, seriesProvider, 60);
addNumberSeries(graph, seriesProvider, 80);
- graph.setTitle("Test pie chart"); //$NON-NLS-1$
+ graph.setTitle("Test pie chart");
graph.setMetadataProvider(new DefaultMetadataProvider());
graph.setDataProvider(seriesProvider);
GreyChartPanel panel = new GreyChartPanel(graph);
- panel.setName("default pie chart"); //$NON-NLS-1$
+ panel.setName("default pie chart");
panel.addMouseListener(new MyMouseListener());
ChartRenderingToolkit.testComponent(panel, 320, 250);
}
--- old/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/RenderingOutOfOrderTester.java 2019-02-27 20:12:25.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/RenderingOutOfOrderTester.java 2019-02-27 20:12:25.000000000 +0100
@@ -81,7 +81,7 @@
*/
@Override
public void mouseClicked(MouseEvent e) {
- System.out.println("Adding value!"); //$NON-NLS-1$
+ System.out.println("Adding value!");
doStep();
}
@@ -90,7 +90,7 @@
*/
@Override
public void mouseEntered(MouseEvent e) {
- System.out.println("Entered graph!"); //$NON-NLS-1$
+ System.out.println("Entered graph!");
}
/**
@@ -98,7 +98,7 @@
*/
@Override
public void mouseExited(MouseEvent e) {
- System.out.println("Exited graph!"); //$NON-NLS-1$
+ System.out.println("Exited graph!");
}
}
@@ -123,7 +123,7 @@
SAW_DATA = new TimestampDataSeries();
provider.addDataSeries(SAW_DATA);
provider.addDataSeries(SINUS_DATA);
- String title = "Out of order rendering test. Click for next point!"; //$NON-NLS-1$
+ String title = "Out of order rendering test. Click for next point!";
DefaultXYGreyChart graph = new DefaultXYGreyChart<>();
DefaultYAxis yaxis_left = new DefaultYAxis(graph);
@@ -134,7 +134,7 @@
yaxis_left.setNumberOfTicks(20);
yaxis_left.setAlwaysShowZero(false);
yaxis_left.setAutoPadding(0.05);
- yaxis_left.setTitle("Saw value"); //$NON-NLS-1$
+ yaxis_left.setTitle("Saw value");
yaxis_left.setPosition(Position.LEFT);
yaxis_right.setMin(MIN_Y);
yaxis_right.setMax(MAX_Y);
@@ -142,7 +142,7 @@
yaxis_right.setNumberOfTicks(20);
yaxis_right.setAlwaysShowZero(false);
yaxis_right.setAutoPadding(0.05);
- yaxis_right.setTitle("Sine value"); //$NON-NLS-1$
+ yaxis_right.setTitle("Sine value");
yaxis_right.setPosition(Position.RIGHT);
graph.setMetadataProvider(new DefaultMetadataProvider());
@@ -158,14 +158,14 @@
graph.addYAxis(yaxis_left);
graph.addYAxis(yaxis_right);
- graph.getXAxis().setTitle("Time"); //$NON-NLS-1$
+ graph.getXAxis().setTitle("Time");
panel = new GreyChartPanel(graph);
graph.setIndexRenderer(new DefaultVerticalIndexRenderer(graph));
panel.setBackground(new Color(240, 240, 240));
panel.addMouseListener(new MyMouseListener());
- panel.setName("rendering performance"); //$NON-NLS-1$
+ panel.setName("rendering performance");
panel.setBackground(Color.WHITE);
panel.getChart().getPlotRenderer().setBackground(Color.LIGHT_GRAY);
// Range chosen to provoke interpolation.
--- old/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/RenderingPerformanceTester.java 2019-02-27 20:12:26.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.greychart.test/src/test/java/org/openjdk/jmc/greychart/testutil/RenderingPerformanceTester.java 2019-02-27 20:12:26.000000000 +0100
@@ -75,7 +75,7 @@
*/
@Override
public void mouseClicked(MouseEvent e) {
- System.out.println("Adding value!"); //$NON-NLS-1$
+ System.out.println("Adding value!");
if (m_adder != null) {
m_adder.doStep();
}
@@ -86,7 +86,7 @@
*/
@Override
public void mouseEntered(MouseEvent e) {
- System.out.println("Entered graph!"); //$NON-NLS-1$
+ System.out.println("Entered graph!");
}
/**
@@ -94,7 +94,7 @@
*/
@Override
public void mouseExited(MouseEvent e) {
- System.out.println("Exited graph!"); //$NON-NLS-1$
+ System.out.println("Exited graph!");
}
}
@@ -114,7 +114,7 @@
SAW_DATA = new TimestampDataSeries();
provider.addDataSeries(SAW_DATA);
provider.addDataSeries(SINUS_DATA);
- String title = "Mode: "; //$NON-NLS-1$
+ String title = "Mode: ";
DefaultXYGreyChart graph = new DefaultXYGreyChart<>();
DefaultYAxis yaxis_left = new DefaultYAxis(graph);
@@ -125,7 +125,7 @@
yaxis_left.setNumberOfTicks(20);
yaxis_left.setAlwaysShowZero(false);
yaxis_left.setAutoPadding(0.05);
- yaxis_left.setTitle("Saw value"); //$NON-NLS-1$
+ yaxis_left.setTitle("Saw value");
yaxis_left.setPosition(Position.LEFT);
yaxis_right.setMin(MIN_Y);
yaxis_right.setMax(MAX_Y);
@@ -133,7 +133,7 @@
yaxis_right.setNumberOfTicks(20);
yaxis_right.setAlwaysShowZero(false);
yaxis_right.setAutoPadding(0.05);
- yaxis_right.setTitle("Sine value"); //$NON-NLS-1$
+ yaxis_right.setTitle("Sine value");
yaxis_right.setPosition(Position.RIGHT);
// yaxis.setVisible(false);
// xaxis.setVisible(false);
@@ -151,17 +151,17 @@
graph.addYAxis(yaxis_left);
graph.addYAxis(yaxis_right);
- graph.getXAxis().setTitle("Time"); //$NON-NLS-1$
+ graph.getXAxis().setTitle("Time");
panel = new GreyChartPanel(graph);
graph.setIndexRenderer(new DefaultVerticalIndexRenderer(graph));
panel.setBackground(new Color(240, 240, 240));
- if (set.contains("gradient")) { //$NON-NLS-1$
- title += "gradient "; //$NON-NLS-1$
+ if (set.contains("gradient")) {
+ title += "gradient ";
}
- if (set.contains("fill")) { //$NON-NLS-1$
- title += "fill "; //$NON-NLS-1$
+ if (set.contains("fill")) {
+ title += "fill ";
}
// if (set.contains("averaging")) {
// ((DefaultXYLineRenderer) graph.getSeriesPlotRenderer())
@@ -174,7 +174,7 @@
// }
panel.addMouseListener(new MyMouseListener());
- panel.setName("rendering performance"); //$NON-NLS-1$
+ panel.setName("rendering performance");
panel.setBackground(Color.WHITE);
panel.getChart().getPlotRenderer().setBackground(Color.LIGHT_GRAY);
graph.setAntialiasingEnabled(false);
--- old/application/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/TestToolkit.java 2019-02-27 20:12:27.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/TestToolkit.java 2019-02-27 20:12:26.000000000 +0100
@@ -50,7 +50,7 @@
private static final String HEXES = "0123456789ABCDEF";
private final static SecureRandom RND = new SecureRandom();
public static final int TEST_MULTICAST_PORT = 7711;
- private static final String TEST_MULTICAST_ADDRESS_STRING = "224.0.23.177"; //$NON-NLS-1$
+ private static final String TEST_MULTICAST_ADDRESS_STRING = "224.0.23.177";
public static final InetAddress TEST_MULTICAST_ADDRESS;
static {
@@ -59,7 +59,7 @@
tmp = InetAddress.getByName(TEST_MULTICAST_ADDRESS_STRING);
} catch (UnknownHostException e) {
// Multicast address by IP, should never happen!
- JDPClientTest.LOGGER.log(Level.SEVERE, "Could not create test multicast address!", e); //$NON-NLS-1$ //$NON-NLS-2$
+ JDPClientTest.LOGGER.log(Level.SEVERE, "Could not create test multicast address!", e);
}
TEST_MULTICAST_ADDRESS = tmp;
}
--- old/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrControlTest.java 2019-02-27 20:12:27.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrControlTest.java 2019-02-27 20:12:27.000000000 +0100
@@ -91,7 +91,7 @@
IQuantity duration = MILLISECOND.quantity(5000);
Random rnd = new Random();
- String name = "test_recording_" + rnd.nextInt() % 4711; //$NON-NLS-1$
+ String name = "test_recording_" + rnd.nextInt() % 4711;
IFlightRecorderService service = getFlightRecorderService();
IConstrainedMap recordingOptions = new RecordingOptionsBuilder(service).name(name).duration(duration)
.build();
@@ -101,7 +101,7 @@
assertNotNull(durationOption);
assertSame(duration, (IQuantity) durationOption);
assertEquals(IRecordingDescriptor.RecordingState.RUNNING, recording.getState());
- System.out.println("Started " + recording.getName()); //$NON-NLS-1$
+ System.out.println("Started " + recording.getName());
assertEquals(name, recording.getName());
service.stop(recording);
@@ -113,7 +113,7 @@
Thread.sleep(1000);
}
assertEquals(IRecordingDescriptor.RecordingState.STOPPED, recording.getState());
- System.out.println("Stopped " + recording.getName()); //$NON-NLS-1$
+ System.out.println("Stopped " + recording.getName());
service.close(recording);
recording = service.getUpdatedRecordingDescription(recording);
assertNull(recording);
@@ -142,7 +142,7 @@
while ((lastRead = stream.read(bytes)) != -1) {
read += lastRead;
}
- assertMin("Should have read something!", 1, read); //$NON-NLS-1$
+ assertMin("Should have read something!", 1, read);
stream.close();
stopRecording(recording);
}
--- old/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrPackageExampleTest.java 2019-02-27 20:12:28.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrPackageExampleTest.java 2019-02-27 20:12:28.000000000 +0100
@@ -63,9 +63,9 @@
@Test
public void testPackageExample1FunctionalityVerbatim() throws Exception {
- IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build(); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build();
IServerHandle serverHandle = IServerHandle.create(descriptor);
- IConnectionHandle handle = serverHandle.connect("Get JFR recording info"); //$NON-NLS-1$
+ IConnectionHandle handle = serverHandle.connect("Get JFR recording info");
try {
IFlightRecorderService jfr = handle.getServiceOrThrow(IFlightRecorderService.class);
for (IRecordingDescriptor desc : jfr.getAvailableRecordings()) {
@@ -78,7 +78,7 @@
@Test
public void testPackageExample2FunctionalityVerbatim() throws Exception {
- IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build(); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build();
IServerHandle serverHandle = IServerHandle.create(descriptor);
IConnectionHandle handle = serverHandle.connect("Start time bound flight recording");
try {
--- old/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrTestCase.java 2019-02-27 20:12:29.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/JfrTestCase.java 2019-02-27 20:12:28.000000000 +0100
@@ -88,11 +88,11 @@
protected IRecordingDescriptor startContinuousRecording() throws Exception {
Random rnd = new Random();
- String name = "test_recording_" + rnd.nextInt() % 4711; //$NON-NLS-1$
+ String name = "test_recording_" + rnd.nextInt() % 4711;
IFlightRecorderService service = getFlightRecorderService();
IConstrainedMap recordingOptions = new RecordingOptionsBuilder(service).name(name).duration(0L).build();
IRecordingDescriptor recording = service.start(recordingOptions, service.getDefaultEventOptions());
- System.out.println("Started " + recording.getName()); //$NON-NLS-1$
+ System.out.println("Started " + recording.getName());
IConstrainedMap options = service.getRecordingOptions(recording);
Object durationOption = options.get(RecordingOptionsBuilder.KEY_DURATION);
// FIXME: It seems duration may be null for continuous recordings on Java 9 and later. Check with specification.
@@ -117,7 +117,7 @@
Thread.sleep(1000);
}
assertEquals(IRecordingDescriptor.RecordingState.STOPPED, recording.getState());
- System.out.println("Stopped " + recording.getName()); //$NON-NLS-1$
+ System.out.println("Stopped " + recording.getName());
service.close(recording);
recording = service.getUpdatedRecordingDescription(recording);
assertNull(recording);
--- old/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/RecordingOptionsTest.java 2019-02-27 20:12:29.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/src/test/java/org/openjdk/jmc/rjmx/services/jfr/test/RecordingOptionsTest.java 2019-02-27 20:12:29.000000000 +0100
@@ -79,7 +79,7 @@
@Test
public void testValidateOption() throws Exception {
RecordingOptionsBuilder builder = new RecordingOptionsBuilder(getFlightRecorderService());
- builder.addByKey(RecordingOptionsBuilder.KEY_DURATION, "20s"); //$NON-NLS-1$
+ builder.addByKey(RecordingOptionsBuilder.KEY_DURATION, "20s");
IConstrainedMap options = builder.build();
try {
ValidationToolkit.validate(options);
@@ -94,7 +94,7 @@
IMutableConstrainedMap options = service.getDefaultRecordingOptions().emptyWithSameConstraints();
try {
// Not allowed to put string representations directly in options map anymore.
- options.put(RecordingOptionsBuilder.KEY_DURATION, "20s"); //$NON-NLS-1$
+ options.put(RecordingOptionsBuilder.KEY_DURATION, "20s");
fail("Expected exception to be thrown for invalid options");
} catch (Exception expected) {
}
@@ -104,7 +104,7 @@
@Test
public void testStringOptions() throws Exception {
RecordingOptionsBuilder builder = new RecordingOptionsBuilder(getFlightRecorderService());
- builder.addByKey(RecordingOptionsBuilder.KEY_DURATION, "20s"); //$NON-NLS-1$
+ builder.addByKey(RecordingOptionsBuilder.KEY_DURATION, "20s");
IConstrainedMap map = builder.build();
assertSame(SECOND.quantity(20), (IQuantity) map.get(RecordingOptionsBuilder.KEY_DURATION));
}
@@ -115,11 +115,11 @@
IFlightRecorderService service = getFlightRecorderService();
RecordingOptionsBuilder builder = new RecordingOptionsBuilder(service);
boolean hasCompressed = "1.0".equals(service.getVersion());
- props.put(RecordingOptionsBuilder.KEY_DURATION, "45 ms"); //$NON-NLS-1$
+ props.put(RecordingOptionsBuilder.KEY_DURATION, "45 ms");
Date myDate = new Date();
if (hasCompressed) {
- props.put(RecordingOptionsBuilder.KEY_DESTINATION_FILE, "myfile"); //$NON-NLS-1$
- props.put(RecordingOptionsBuilder.KEY_DESTINATION_COMPRESSED, "true"); //$NON-NLS-1$
+ props.put(RecordingOptionsBuilder.KEY_DESTINATION_FILE, "myfile");
+ props.put(RecordingOptionsBuilder.KEY_DESTINATION_COMPRESSED, "true");
// FIXME: Do we really want to support parsing Date.toString() format?
// props.put(RecordingOptionsBuilder.KEY_START_TIME, myDate.toString());
props.put(RecordingOptionsBuilder.KEY_START_TIME, Long.toString(myDate.getTime()));
@@ -127,7 +127,7 @@
IConstrainedMap options = builder.fromProperties(props).build();
assertSame(MILLISECOND.quantity(45), (IQuantity) options.get(RecordingOptionsBuilder.KEY_DURATION));
if (hasCompressed) {
- assertEquals("myfile", options.get(RecordingOptionsBuilder.KEY_DESTINATION_FILE)); //$NON-NLS-1$
+ assertEquals("myfile", options.get(RecordingOptionsBuilder.KEY_DESTINATION_FILE));
assertEquals(Boolean.TRUE, options.get(RecordingOptionsBuilder.KEY_DESTINATION_COMPRESSED));
assertSame(UnitLookup.fromDate(myDate), (IQuantity) options.get(RecordingOptionsBuilder.KEY_START_TIME));
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/BasicCommunicationTest.java 2019-02-27 20:12:30.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/BasicCommunicationTest.java 2019-02-27 20:12:30.000000000 +0100
@@ -60,8 +60,8 @@
*/
public class BasicCommunicationTest extends ServerHandleTestCase {
final static int DEFAULT_PORT = 0;
- final static String DEFAULT_HOST = "localhost".intern(); //$NON-NLS-1$
- final static String ALTERNATIVE_HOST = "127.1.0.1".intern(); //$NON-NLS-1$
+ final static String DEFAULT_HOST = "localhost".intern();
+ final static String ALTERNATIVE_HOST = "127.1.0.1".intern();
/**
* Attempts creating a {@link JMXConnectionDescriptor} with a bunch of options.
@@ -76,9 +76,9 @@
@Test
public void testIConnectionHandle() throws Exception {
- IConnectionHandle handle = getDefaultServer().connect("Test"); //$NON-NLS-1$
- MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", //$NON-NLS-1$
- "ThreadCount"); //$NON-NLS-1$
+ IConnectionHandle handle = getDefaultServer().connect("Test");
+ MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading",
+ "ThreadCount");
MBeanServerConnection connection = handle.getServiceOrThrow(MBeanServerConnection.class);
assertBetween(1L, 1000L,
((Number) connection.getAttribute(descriptor.getObjectName(), descriptor.getDataPath())).longValue());
@@ -87,7 +87,7 @@
@Test
public void testServerHandle() throws Exception {
- IConnectionHandle handle = getDefaultServer().connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = getDefaultServer().connect("Test");
assertEquals(1, getDefaultServer().getConnectionHandles().length);
assertEquals(handle, getDefaultServer().getConnectionHandles()[0]);
@@ -98,12 +98,12 @@
protected void muppTestConnection() throws Exception {
ConnectionDescriptorBuilder builder = new ConnectionDescriptorBuilder();
- IConnectionDescriptor descriptor = builder.hostName("localhost").port(0).build(); //$NON-NLS-1$
- IConnectionHandle handle = IServerHandle.create(descriptor).connect("Test"); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = builder.hostName("localhost").port(0).build();
+ IConnectionHandle handle = IServerHandle.create(descriptor).connect("Test");
ISubscriptionService service = handle.getServiceOrThrow(ISubscriptionService.class);
- MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", //$NON-NLS-1$
- "ThreadCount"); //$NON-NLS-1$
+ MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading",
+ "ThreadCount");
service.addMRIValueListener(attribute, new IMRIValueListener() {
@Override
public void valueChanged(MRIValueEvent event) {
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/DefaultServicesTest.java 2019-02-27 20:12:31.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/DefaultServicesTest.java 2019-02-27 20:12:31.000000000 +0100
@@ -51,23 +51,23 @@
@Test
public void testMBeanServerConnection() throws Exception {
- IConnectionHandle handle = getDefaultServer().connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = getDefaultServer().connect("Test");
MBeanServerConnection connection = handle.getServiceOrThrow(MBeanServerConnection.class);
String[] domains = connection.getDomains();
assertNotNull(connection.getDomains());
// At least java.lang, no matter what, or we're breaking J2SE compliance...
for (String domain : domains) {
- if (domain.equals("java.lang")) { //$NON-NLS-1$
+ if (domain.equals("java.lang")) {
return;
}
}
- fail("Could not find java.lang.management among the domains!"); //$NON-NLS-1$
+ fail("Could not find java.lang.management among the domains!");
}
@Test
public void xtestMBeanHelperService() throws Exception {
- IConnectionHandle handle = getDefaultServer().connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = getDefaultServer().connect("Test");
IMBeanHelperService helper = handle.getServiceOrThrow(IMBeanHelperService.class);
// FIXME: JMC-4270 - Server time approximation is not reliable. Disabling until a solution is found.
@@ -75,12 +75,12 @@
//
// // The server time calculations should not be this much off.
// long diff = time - helper.getApproximateServerTime(time);
-// assertLessThan("Server time approximation off by more than five seconds", 5000L, Math.abs(diff)); //$NON-NLS-1$
-// System.out.println("DefaultServicesTest.testMBeanHelperService(): Server time approximation difference = " //$NON-NLS-1$
-// + Math.abs(diff) + " ms"); //$NON-NLS-1$
+// assertLessThan("Server time approximation off by more than five seconds", 5000L, Math.abs(diff));
+// System.out.println("DefaultServicesTest.testMBeanHelperService(): Server time approximation difference = "
+// + Math.abs(diff) + " ms");
// Should at least contain the java.lang mbeans. Just testing for the Threading one.
- assertTrue("Could not find the Threading MBean!", helper.getMBeanNames().contains( //$NON-NLS-1$
- new ObjectName("java.lang:type=Threading"))); //$NON-NLS-1$
+ assertTrue("Could not find the Threading MBean!", helper.getMBeanNames().contains(
+ new ObjectName("java.lang:type=Threading")));
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/PackageExampleTest.java 2019-02-27 20:12:31.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/PackageExampleTest.java 2019-02-27 20:12:31.000000000 +0100
@@ -74,12 +74,12 @@
*/
@Test
public void testPackageExampleVerbatim() throws Exception {
- IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build(); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build();
IServerHandle serverHandle = IServerHandle.create(descriptor);
- IConnectionHandle handle = serverHandle.connect("Usage description"); //$NON-NLS-1$
+ IConnectionHandle handle = serverHandle.connect("Usage description");
try {
ISubscriptionService service = handle.getServiceOrThrow(ISubscriptionService.class);
- MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", "ThreadCount"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", "ThreadCount");
service.addMRIValueListener(attribute, new IMRIValueListener() {
@Override
public void valueChanged(MRIValueEvent event) {
@@ -98,12 +98,12 @@
@Test
public void testPackageExampleFunctionality() throws Exception {
ConnectionDescriptorBuilder builder = new ConnectionDescriptorBuilder();
- IConnectionDescriptor descriptor = builder.hostName("localhost").port(0).build(); //$NON-NLS-1$
- IConnectionHandle handle = IServerHandle.create(descriptor).connect("Usage description"); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = builder.hostName("localhost").port(0).build();
+ IConnectionHandle handle = IServerHandle.create(descriptor).connect("Usage description");
try {
ISubscriptionService service = handle.getServiceOrThrow(ISubscriptionService.class);
gotEvent = false;
- MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", "ThreadCount"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI attribute = new MRI(Type.ATTRIBUTE, "java.lang:type=Threading", "ThreadCount");
service.addMRIValueListener(attribute, new IMRIValueListener() {
@Override
public void valueChanged(MRIValueEvent event) {
@@ -121,7 +121,7 @@
} finally {
IOToolkit.closeSilently(handle);
}
- assertTrue("Never got any event!", gotEvent); //$NON-NLS-1$
+ assertTrue("Never got any event!", gotEvent);
}
@Test
@@ -131,7 +131,7 @@
IServerDescriptor descriptor = server.getServerHandle().getServerDescriptor();
if (descriptor.getJvmInfo() != null
&& Integer.valueOf(Environment.getThisPID()).equals(descriptor.getJvmInfo().getPid())) {
- IConnectionHandle handle = server.getServerHandle().connect("Usage description"); //$NON-NLS-1$
+ IConnectionHandle handle = server.getServerHandle().connect("Usage description");
try {
handle.getServiceOrThrow(IMBeanHelperService.class).getMBeanNames().size();
return;
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/RjmxTestCase.java 2019-02-27 20:12:32.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/RjmxTestCase.java 2019-02-27 20:12:32.000000000 +0100
@@ -66,29 +66,29 @@
/**
* The host running the management server.
*/
- public final static String PROPERTY_RJMX_HOST = "jmc.test.rjmx.host"; //$NON-NLS-1$
+ public final static String PROPERTY_RJMX_HOST = "jmc.test.rjmx.host";
/**
* The port of the management server. (Used for both JMX over RMI and RMP.)
*/
- public final static String PROPERTY_RJMX_PORT = "jmc.test.rjmx.port"; //$NON-NLS-1$
+ public final static String PROPERTY_RJMX_PORT = "jmc.test.rjmx.port";
/**
* Boolean option to use RMP to talk to the management server. (False means to use JMX over
* RMI.)
*/
- public final static String PROPERTY_RJMX_RMP = "jmc.test.rjmx.rmp"; //$NON-NLS-1$
+ public final static String PROPERTY_RJMX_RMP = "jmc.test.rjmx.rmp";
/**
* The service URL to the management server. (If set, has precedence over host, port and
* protocol.)
*/
- public final static String PROPERTY_JMX_SERVICE_URL = "jmc.test.rjmx.serviceURL"; //$NON-NLS-1$
+ public final static String PROPERTY_JMX_SERVICE_URL = "jmc.test.rjmx.serviceURL";
/**
* The default host to test against.
*/
- public final static String DEFAULT_HOST = "localhost"; //$NON-NLS-1$
+ public final static String DEFAULT_HOST = "localhost";
protected String m_host;
protected IConnectionHandle m_connectionHandle;
@@ -129,19 +129,19 @@
protected static boolean probe(IConnectionDescriptor descriptor) {
long start = System.currentTimeMillis();
try {
- System.out.println("Probing Service URL " + descriptor.createJMXServiceURL() + " ..."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("Probing Service URL " + descriptor.createJMXServiceURL() + " ...");
IConnectionHandle handle = createConnectionHandle(descriptor);
long up = System.currentTimeMillis();
- System.out.println("... connected in " + (up - start) + " ms ..."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("... connected in " + (up - start) + " ms ...");
// Just in case we fail ...
start = up;
handle.close();
long down = System.currentTimeMillis();
- System.out.println("... closed in " + (down - start) + " ms."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("... closed in " + (down - start) + " ms.");
return true;
} catch (Exception e) {
long fail = System.currentTimeMillis();
- System.out.println("... failed in " + (fail - start) + " ms."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("... failed in " + (fail - start) + " ms.");
return false;
}
}
@@ -169,7 +169,7 @@
*/
public static void getServerProperties(IConnectionHandle connector, Properties props, String prefix)
throws Exception {
- System.out.println("Retrieving system properties (prefixed with '" + prefix + "') ..."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("Retrieving system properties (prefixed with '" + prefix + "') ...");
MBeanServerConnection server = connector.getServiceOrThrow(MBeanServerConnection.class);
Map systemProperties = ConnectionToolkit.getRuntimeBean(server).getSystemProperties();
if (systemProperties != null) {
@@ -177,7 +177,7 @@
props.setProperty(prefix + e.getKey(), e.getValue());
}
} else {
- System.out.println("Could not retrieve system properties"); //$NON-NLS-1$
+ System.out.println("Could not retrieve system properties");
}
}
@@ -193,10 +193,10 @@
*/
public static void getServerProperties(IConnectionDescriptor connDesc, Properties props, String prefix)
throws Exception {
- System.out.println("Connecting to " + connDesc.createJMXServiceURL() + " ..."); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("Connecting to " + connDesc.createJMXServiceURL() + " ...");
IConnectionHandle connectionHandle = createConnectionHandle(connDesc);
getServerProperties(connectionHandle, props, prefix);
- System.out.println("Disconnecting ..."); //$NON-NLS-1$
+ System.out.println("Disconnecting ...");
connectionHandle.close();
}
@@ -220,7 +220,7 @@
*/
private static IConnectionHandle createConnectionHandle(IConnectionDescriptor descriptor)
throws IOException, FailedLoginException, ConnectionException {
- return IServerHandle.create(descriptor).connect("Test"); //$NON-NLS-1$
+ return IServerHandle.create(descriptor).connect("Test");
}
/**
@@ -263,22 +263,22 @@
}
protected void assumeHotSpot8OrLater(IConnectionHandle handle) {
- Assume.assumeTrue("This test assumes JDK 8 (HotSpot 25) or later!", ConnectionToolkit.isHotSpot(handle) //$NON-NLS-1$
+ Assume.assumeTrue("This test assumes JDK 8 (HotSpot 25) or later!", ConnectionToolkit.isHotSpot(handle)
&& ConnectionToolkit.isJavaVersionAboveOrEqual(handle, JavaVersionSupport.JDK_8));
}
protected void assumeHotSpot7u4OrLater(IConnectionHandle handle) {
- Assume.assumeTrue("This test assumes JDK 7u4 (HotSpot 23) or later!", ConnectionToolkit.isHotSpot(handle) //$NON-NLS-1$
+ Assume.assumeTrue("This test assumes JDK 7u4 (HotSpot 23) or later!", ConnectionToolkit.isHotSpot(handle)
&& ConnectionToolkit.isJavaVersionAboveOrEqual(handle, JavaVersionSupport.JDK_7_U_4));
}
protected void assumeHotSpot7u12OrLater(IConnectionHandle handle) {
- Assume.assumeTrue("This test assumes JDK 7u12 (HotSpot 24) or later!", ConnectionToolkit.isHotSpot(handle) //$NON-NLS-1$
+ Assume.assumeTrue("This test assumes JDK 7u12 (HotSpot 24) or later!", ConnectionToolkit.isHotSpot(handle)
&& ConnectionToolkit.isJavaVersionAboveOrEqual(handle, JavaVersionSupport.JDK_7_U_40));
}
protected void assumeHasDiagnosticCommandsService(IConnectionHandle handle) {
- Assume.assumeTrue("This test needs a working diagnostic commands service!", //$NON-NLS-1$
+ Assume.assumeTrue("This test needs a working diagnostic commands service!",
handle.hasService(IDiagnosticCommandService.class));
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/RJMXConnectionTest.java 2019-02-27 20:12:33.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/RJMXConnectionTest.java 2019-02-27 20:12:33.000000000 +0100
@@ -66,12 +66,12 @@
@SuppressWarnings("nls")
public class RJMXConnectionTest extends RjmxTestCase {
// The MBEANS vital to console functionality.
- public final static String[] MBEAN_NAMES = {"java.lang:type=OperatingSystem", "java.lang:type=ClassLoading", //$NON-NLS-1$ //$NON-NLS-2$
- "java.lang:type=Threading", "java.lang:type=Compilation", "java.lang:type=Memory", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- "java.lang:type=Runtime", "java.lang:type=MemoryPool,*", "java.lang:type=GarbageCollector,*", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- "java.lang:type=MemoryManager,*"}; //$NON-NLS-1$
+ public final static String[] MBEAN_NAMES = {"java.lang:type=OperatingSystem", "java.lang:type=ClassLoading",
+ "java.lang:type=Threading", "java.lang:type=Compilation", "java.lang:type=Memory",
+ "java.lang:type=Runtime", "java.lang:type=MemoryPool,*", "java.lang:type=GarbageCollector,*",
+ "java.lang:type=MemoryManager,*"};
- public final static String[] MBEAN_CLASS_NAMES = {"sun.management.RuntimeImpl"}; //$NON-NLS-1$
+ public final static String[] MBEAN_CLASS_NAMES = {"sun.management.RuntimeImpl"};
public static final int MIN_CPUS = 1;
public static final int MAX_CPUS = 1024;
@@ -79,7 +79,7 @@
private MRI[] ATTRIBUTES_OS;
// Only use this one for testing!
- private final static String[] ATTRIBUTE_SPEC_NAME = {"SpecName"}; //$NON-NLS-1$
+ private final static String[] ATTRIBUTE_SPEC_NAME = {"SpecName"};
private RJMXConnection m_connection;
/**
@@ -99,9 +99,9 @@
}
public static MRI[] getOSAttributes() {
- return new MRI[] {new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"), //$NON-NLS-1$ //$NON-NLS-2$
- new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad"), //$NON-NLS-1$ //$NON-NLS-2$
- new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "AvailableProcessors")}; //$NON-NLS-1$ //$NON-NLS-2$
+ return new MRI[] {new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"),
+ new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad"),
+ new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "AvailableProcessors")};
}
@After
@@ -134,7 +134,7 @@
break;
}
}
- assertTrue("MBean names did not contain: " + element, found); //$NON-NLS-1$
+ assertTrue("MBean names did not contain: " + element, found);
}
}
@@ -182,14 +182,14 @@
}
// No longer check all the class names
for (String element : MBEAN_CLASS_NAMES) {
- assertTrue("Returned infos did not contain MBean class name: " + element, infos //$NON-NLS-1$
+ assertTrue("Returned infos did not contain MBean class name: " + element, infos
.containsKey(element));
}
MBeanInfo loggingInfo = infos.get(MBEAN_CLASS_NAMES[0]);
- assertNotNull("MBeanInfo was null for " + MBEAN_CLASS_NAMES[0], loggingInfo); //$NON-NLS-1$
+ assertNotNull("MBeanInfo was null for " + MBEAN_CLASS_NAMES[0], loggingInfo);
MBeanAttributeInfo[] attrInfo = loggingInfo.getAttributes();
- assertNotNull("MBeanAttributeInfo was null for " + MBEAN_CLASS_NAMES[0], attrInfo); //$NON-NLS-1$
+ assertNotNull("MBeanAttributeInfo was null for " + MBEAN_CLASS_NAMES[0], attrInfo);
}
@Test
@@ -210,7 +210,7 @@
Object attr = m_connection
.getAttributeValue(new MRI(Type.ATTRIBUTE, getObjectName(MBEAN_NAMES[5]), ATTRIBUTE_SPEC_NAME[0]));
assertNotNull(attr);
- assertTrue(String.valueOf(attr).contains("Virtual Machine")); //$NON-NLS-1$
+ assertTrue(String.valueOf(attr).contains("Virtual Machine"));
}
public void handleRJMXException(Exception exception) {
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/RJMXProxyOperationsTest.java 2019-02-27 20:12:33.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/RJMXProxyOperationsTest.java 2019-02-27 20:12:33.000000000 +0100
@@ -48,7 +48,7 @@
public void testCtrlBreakHandler() throws Exception {
assumeHotSpot8OrLater(getConnectionHandle());
- String help = getDiagnosticCommandService().runCtrlBreakHandlerWithResult("help"); //$NON-NLS-1$
+ String help = getDiagnosticCommandService().runCtrlBreakHandlerWithResult("help");
Assert.assertNotNull(help);
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/TabularDataBeanTestMBean.java 2019-02-27 20:12:34.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/internal/TabularDataBeanTestMBean.java 2019-02-27 20:12:34.000000000 +0100
@@ -60,39 +60,39 @@
public TabularDataBeanTestMBean() {
CompositeType simpleCompositeType;
try {
- simpleCompositeType = new CompositeType("simpleCompositeType", "compdescription", //$NON-NLS-1$ //$NON-NLS-2$
- new String[] {"djur", "bil", "apa", "båt"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- new String[] {"ett djur", "en bil", "en apa", "en båt"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ simpleCompositeType = new CompositeType("simpleCompositeType", "compdescription",
+ new String[] {"djur", "bil", "apa", "båt"},
+ new String[] {"ett djur", "en bil", "en apa", "en båt"},
new OpenType[] {SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING,});
- TabularType simpleTabularType = new TabularType("simpleTabularTypeName", "tabdescription", //$NON-NLS-1$ //$NON-NLS-2$
- simpleCompositeType, new String[] {"djur", "bil", "apa", "båt"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ TabularType simpleTabularType = new TabularType("simpleTabularTypeName", "tabdescription",
+ simpleCompositeType, new String[] {"djur", "bil", "apa", "båt"});
OpenType>[] compositeContentsTypes = new OpenType[5];
String[] compositeKeys = new String[5];
String[] compositeDescriptions = new String[5];
compositeContentsTypes[0] = simpleTabularType;
- compositeKeys[0] = "Tab Data"; //$NON-NLS-1$
- compositeDescriptions[0] = "tab data desc"; //$NON-NLS-1$
+ compositeKeys[0] = "Tab Data";
+ compositeDescriptions[0] = "tab data desc";
compositeContentsTypes[4] = simpleCompositeType;
- compositeKeys[4] = "Comp Data"; //$NON-NLS-1$
- compositeDescriptions[4] = "comp data desc"; //$NON-NLS-1$
+ compositeKeys[4] = "Comp Data";
+ compositeDescriptions[4] = "comp data desc";
compositeContentsTypes[3] = new ArrayType(2, SimpleType.STRING);
- compositeKeys[3] = "Array Data"; //$NON-NLS-1$
- compositeDescriptions[3] = "comp data desc"; //$NON-NLS-1$
+ compositeKeys[3] = "Array Data";
+ compositeDescriptions[3] = "comp data desc";
for (int i = 1; i < 3; i++) {
compositeContentsTypes[i] = SimpleType.STRING;
- compositeKeys[i] = "StringIndex" + i; //$NON-NLS-1$
- compositeDescriptions[i] = "description" + i; //$NON-NLS-1$
+ compositeKeys[i] = "StringIndex" + i;
+ compositeDescriptions[i] = "description" + i;
}
- CompositeType complexCompositeType = new CompositeType("ComplexCompositeTypeName", //$NON-NLS-1$
- "complex composite type desc", compositeKeys, compositeDescriptions, compositeContentsTypes); //$NON-NLS-1$
- TabularType complexTabularType = new TabularType("ComplexTabularTypeName", "complex tabular type", //$NON-NLS-1$ //$NON-NLS-2$
+ CompositeType complexCompositeType = new CompositeType("ComplexCompositeTypeName",
+ "complex composite type desc", compositeKeys, compositeDescriptions, compositeContentsTypes);
+ TabularType complexTabularType = new TabularType("ComplexTabularTypeName", "complex tabular type",
complexCompositeType, compositeKeys);
CompositeData simpleCompositeData = new CompositeDataSupport(simpleCompositeType,
- new String[] {"djur", "bil", "apa", "båt"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- new String[] {"häst", "corvette", "lemur", "nautilus"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new String[] {"djur", "bil", "apa", "båt"},
+ new String[] {"häst", "corvette", "lemur", "nautilus"});
TabularDataSupport simpleTabularData = new TabularDataSupport(simpleTabularType);
simpleTabularData.put(simpleCompositeData);
/*
@@ -102,14 +102,14 @@
*/
compTest = new CompositeDataSupport(complexCompositeType, compositeKeys,
- new Object[] {simpleTabularData, "string2", "string3", //$NON-NLS-1$ //$NON-NLS-2$
- new String[][] {{"string1_1", "string1_2"}, {"string2_1", "string2_2"}}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new Object[] {simpleTabularData, "string2", "string3",
+ new String[][] {{"string1_1", "string1_2"}, {"string2_1", "string2_2"}},
simpleCompositeData});
tabTest = new TabularDataSupport(complexTabularType);
tabTest.put(compTest);
tabTest.put(new CompositeDataSupport(complexCompositeType, compositeKeys,
- new Object[] {simpleTabularData, "secondcomp2", "secondcomp3", //$NON-NLS-1$ //$NON-NLS-2$
- new String[][] {{"array1_1", "array1_2"}, {"array2_1", "array2_2"}}, simpleCompositeData})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new Object[] {simpleTabularData, "secondcomp2", "secondcomp3",
+ new String[][] {{"array1_1", "array1_2"}, {"array2_1", "array2_2"}}, simpleCompositeData}));
/*
* tabTest.put(complexCompositeData); tabTest.put(complexCompositeData);
* tabTest.put(complexCompositeData); tabTest.put(complexCompositeData);
@@ -155,7 +155,7 @@
try {
try {
ManagementFactory.getPlatformMBeanServer().createMBean(TabularDataBeanTestMBean.class.getName(),
- new ObjectName("com.jrockit", "name", "TestMBean")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new ObjectName("com.jrockit", "name", "TestMBean"));
} catch (Exception e) {
e.printStackTrace();
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/services/CommercialFeaturesServiceTest.java 2019-02-27 20:12:35.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/services/CommercialFeaturesServiceTest.java 2019-02-27 20:12:35.000000000 +0100
@@ -66,7 +66,7 @@
if (!service.isCommercialFeaturesEnabled()) {
service.enableCommercialFeatures();
}
- assertTrue("Commercial features should now be enabled!", service.isCommercialFeaturesEnabled()); //$NON-NLS-1$
+ assertTrue("Commercial features should now be enabled!", service.isCommercialFeaturesEnabled());
}
private ICommercialFeaturesService getCommercialFeaturesService() throws ConnectionException {
@@ -78,7 +78,7 @@
ICommercialFeaturesService service = handle.getServiceOrNull(ICommercialFeaturesService.class);
assertNotNull(
- "Could not retrieve the commercial features service. Please make sure that you are connecting to a Java 7u4 or later JVM.", //$NON-NLS-1$
+ "Could not retrieve the commercial features service. Please make sure that you are connecting to a Java 7u4 or later JVM.",
service);
return service;
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/services/ServicesPackageExampleTest.java 2019-02-27 20:12:36.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/services/ServicesPackageExampleTest.java 2019-02-27 20:12:35.000000000 +0100
@@ -54,14 +54,14 @@
// NOTE: If you change the verbatim test YOU MUST update the corresponding package.html document.
public class ServicesPackageExampleTest extends RjmxTestCase {
public void packageExampleFunctionalityVerbatim() throws Exception {
- IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build(); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build();
IServerHandle handle = IServerHandle.create(descriptor);
try {
- IConnectionHandle connection = handle.connect("Run Diagnostic commands"); //$NON-NLS-1$
+ IConnectionHandle connection = handle.connect("Run Diagnostic commands");
assumeHasDiagnosticCommandsService(connection);
IDiagnosticCommandService dcmd = connection.getServiceOrThrow(IDiagnosticCommandService.class);
for (IOperation operation : dcmd.getOperations()) {
- System.out.println(dcmd.runCtrlBreakHandlerWithResult(String.format("help %s", operation.getName()))); //$NON-NLS-1$
+ System.out.println(dcmd.runCtrlBreakHandlerWithResult(String.format("help %s", operation.getName())));
}
} finally {
handle.dispose();
@@ -70,16 +70,16 @@
@Test
public void testPackageExampleFunctionality() throws Exception {
- IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build(); //$NON-NLS-1$
+ IConnectionDescriptor descriptor = new ConnectionDescriptorBuilder().hostName("localhost").port(0).build();
IServerHandle handle = IServerHandle.create(descriptor);
try {
- IConnectionHandle connection = handle.connect("Run Diagnostic commands"); //$NON-NLS-1$
+ IConnectionHandle connection = handle.connect("Run Diagnostic commands");
assumeHasDiagnosticCommandsService(connection);
IDiagnosticCommandService dcmd = connection.getServiceOrThrow(IDiagnosticCommandService.class);
for (IOperation operation : dcmd.getOperations()) {
String command = operation.getName();
- assertNotNull("Could not retrieve help for the command: " + command, //$NON-NLS-1$
- dcmd.runCtrlBreakHandlerWithResult(String.format("help %s", command))); //$NON-NLS-1$
+ assertNotNull("Could not retrieve help for the command: " + command,
+ dcmd.runCtrlBreakHandlerWithResult(String.format("help %s", command)));
}
} finally {
handle.dispose();
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeDescriptorTest.java 2019-02-27 20:12:36.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeDescriptorTest.java 2019-02-27 20:12:36.000000000 +0100
@@ -125,40 +125,40 @@
@Test
public void testCreateFromQualifiedName1() throws Exception {
- MRI descriptor = MRI.createFromQualifiedName("attribute://java.lang:type=OperatingSystem/Arch"); //$NON-NLS-1$
+ MRI descriptor = MRI.createFromQualifiedName("attribute://java.lang:type=OperatingSystem/Arch");
assertEquals(createDescriptor1(), descriptor);
}
@Test
public void testCreateFromQualifiedName2() throws Exception {
- MRI descriptor = MRI.createFromQualifiedName("attribute://java.lang:type=OperatingSystem/Arch/Sub"); //$NON-NLS-1$
+ MRI descriptor = MRI.createFromQualifiedName("attribute://java.lang:type=OperatingSystem/Arch/Sub");
assertEquals(Type.ATTRIBUTE, descriptor.getType());
- assertEquals("java.lang:type=OperatingSystem", descriptor.getObjectName().getCanonicalName()); //$NON-NLS-1$
- assertEquals("Arch/Sub", descriptor.getDataPath()); //$NON-NLS-1$
+ assertEquals("java.lang:type=OperatingSystem", descriptor.getObjectName().getCanonicalName());
+ assertEquals("Arch/Sub", descriptor.getDataPath());
}
@Test
public void testMalformedQualifiedName1() throws Exception {
try {
- MRI.createFromQualifiedName("smurf://java.lang:type=OperatingSystem/Arch"); //$NON-NLS-1$
+ MRI.createFromQualifiedName("smurf://java.lang:type=OperatingSystem/Arch");
} catch (IllegalArgumentException iae) {
return;
}
- assertTrue("Should not be possible to create an attribute with the type smurf!", false); //$NON-NLS-1$
+ assertTrue("Should not be possible to create an attribute with the type smurf!", false);
}
@Test
public void testMalformedQualifiedName2() throws Exception {
try {
- MRI.createFromQualifiedName("java.lang:type=OperatingSystem/Arch"); //$NON-NLS-1$
+ MRI.createFromQualifiedName("java.lang:type=OperatingSystem/Arch");
} catch (IllegalArgumentException iae) {
return;
}
- assertTrue("Should not be possible to create an attribute name without specifying a type!", false); //$NON-NLS-1$
+ assertTrue("Should not be possible to create an attribute name without specifying a type!", false);
}
private MRI createDescriptor1() throws Exception {
- return new MRI(Type.ATTRIBUTE, new ObjectName("java.lang:type=OperatingSystem"), "Arch"); //$NON-NLS-1$ //$NON-NLS-2$
+ return new MRI(Type.ATTRIBUTE, new ObjectName("java.lang:type=OperatingSystem"), "Arch");
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeSubscriptionTest.java 2019-02-27 20:12:37.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeSubscriptionTest.java 2019-02-27 20:12:37.000000000 +0100
@@ -60,7 +60,7 @@
IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
ISubscriptionService subscriptionService = handle.getServiceOrThrow(ISubscriptionService.class);
try {
- MRI attributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI attributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad");
subscriptionService.addMRIValueListener(attributeDescriptor, this);
synchronized (this) {
for (int i = 0; i < 4; i++) {
@@ -81,8 +81,8 @@
IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
ISubscriptionService subscriptionService = handle.getServiceOrThrow(ISubscriptionService.class);
try {
- MRI availableProcessorsAttribute = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "AvailableProcessors"); //$NON-NLS-1$
+ MRI availableProcessorsAttribute = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "AvailableProcessors");
subscriptionService.addMRIValueListener(availableProcessorsAttribute, this);
@@ -109,8 +109,8 @@
public void testGetAttributeSubscriptionOne() {
try {
// Starting up a subscription on a one shot attribute.
- MRI physicalMemoryUsedAttribute = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "UsedPhysicalMemorySize"); //$NON-NLS-1$
+ MRI physicalMemoryUsedAttribute = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "UsedPhysicalMemorySize");
getAttributeSubscriptionService().addMRIValueListener(physicalMemoryUsedAttribute, this);
synchronized (this) {
@@ -128,9 +128,9 @@
public void testGetAttributeSubscriptionTwo() {
try {
// Starting up a subscription on a one shot attribute.
- MRI tcad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "UsedPhysicalMemorySize"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI tcad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "UsedPhysicalMemorySize");
getAttributeSubscriptionService().addMRIValueListener(tcad, this);
- MRI tstcad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "FreePhysicalMemorySize"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI tstcad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "FreePhysicalMemorySize");
getAttributeSubscriptionService().addMRIValueListener(tstcad, this);
for (int i = 0; i < 7; i++) {
@@ -156,7 +156,7 @@
public void testGetSyntheticSubscription() {
try {
// Starting up a subscription on a one shot attribute.
- MRI synthad = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsagePercent"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI synthad = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsagePercent");
getAttributeSubscriptionService().addMRIValueListener(synthad, this);
synchronized (this) {
@@ -175,7 +175,7 @@
try {
// Starting up a subscription on a one shot attribute.
- MRI synthad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "PhysicalMemoryUsagePercent"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI synthad = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "PhysicalMemoryUsagePercent");
getAttributeSubscriptionService().addMRIValueListener(synthad, this);
synchronized (this) {
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeValueTest.java 2019-02-27 20:12:38.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/AttributeValueTest.java 2019-02-27 20:12:37.000000000 +0100
@@ -112,12 +112,12 @@
private static List createCommonAttributesList(IConnectionHandle connectionHandle) {
List fetchList = new ArrayList<>();
- fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad")); //$NON-NLS-1$ //$NON-NLS-2$
- fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad")); //$NON-NLS-1$ //$NON-NLS-2$
- fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "TotalPhysicalMemorySize")); //$NON-NLS-1$
- fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "UsedPhysicalMemorySize")); //$NON-NLS-1$
+ fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"));
+ fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad"));
+ fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "TotalPhysicalMemorySize"));
+ fetchList.add(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "UsedPhysicalMemorySize"));
return fetchList;
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/CompositeDataSubscriptionTest.java 2019-02-27 20:12:38.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/CompositeDataSubscriptionTest.java 2019-02-27 20:12:38.000000000 +0100
@@ -66,8 +66,8 @@
public void testCompositeDataSubscription() {
try {
// Starting up a subscription on a one shot attribute.
- MRI attributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", //$NON-NLS-1$
- "HeapMemoryUsage/used"); //$NON-NLS-1$
+ MRI attributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory",
+ "HeapMemoryUsage/used");
getAttributeSubscriptionService().addMRIValueListener(attributeDescriptor, this);
IMRISubscription subscription = getAttributeSubscriptionService().getMRISubscription(attributeDescriptor);
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JRockitPerfCounterMBeanTest.java 2019-02-27 20:12:39.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JRockitPerfCounterMBeanTest.java 2019-02-27 20:12:39.000000000 +0100
@@ -53,7 +53,7 @@
} catch (Exception e) {
fail(e.toString());
}
- assertMin("Should at least have started one thread!", 1, startedThreads); //$NON-NLS-1$
+ assertMin("Should at least have started one thread!", 1, startedThreads);
} catch (Exception e) {
fail(e.getMessage());
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JmxOperatingSystemTest.java 2019-02-27 20:12:40.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JmxOperatingSystemTest.java 2019-02-27 20:12:39.000000000 +0100
@@ -49,12 +49,12 @@
public void testGetCPULoad() {
try {
Object data = getMBeanServerConnection().getAttribute(ConnectionToolkit.OPERATING_SYSTEM_BEAN_NAME,
- "SystemCpuLoad"); //$NON-NLS-1$
+ "SystemCpuLoad");
double cpuLoad = ((Number) data).doubleValue();
// A negative value is returned if load is not available
- assertMax("CPU Load", 100.0, cpuLoad); //$NON-NLS-1$
- TestToolkit.println("CPU Load: " + cpuLoad); //$NON-NLS-1$
+ assertMax("CPU Load", 100.0, cpuLoad);
+ TestToolkit.println("CPU Load: " + cpuLoad);
} catch (Exception e) {
fail(e.getMessage());
}
@@ -64,12 +64,12 @@
public void testGetCPUJVMLoad() {
try {
Object data = getMBeanServerConnection().getAttribute(ConnectionToolkit.OPERATING_SYSTEM_BEAN_NAME,
- "ProcessCpuLoad"); //$NON-NLS-1$
+ "ProcessCpuLoad");
double jvmLoad = ((Number) data).doubleValue();
// A negative value is returned if load is not available
- assertMax("JVM Load", 100.0, jvmLoad); //$NON-NLS-1$
- TestToolkit.println("JVM Load: " + jvmLoad); //$NON-NLS-1$
+ assertMax("JVM Load", 100.0, jvmLoad);
+ TestToolkit.println("JVM Load: " + jvmLoad);
} catch (Exception e) {
fail(e.getMessage());
}
@@ -79,9 +79,9 @@
public void testGetTotalPhysicalMemory() {
try {
Object data = getMBeanServerConnection().getAttribute(ConnectionToolkit.OPERATING_SYSTEM_BEAN_NAME,
- "TotalPhysicalMemorySize"); //$NON-NLS-1$
+ "TotalPhysicalMemorySize");
long totalPhysicalMemory = ((Number) data).longValue();
- assertMin("TotalPhysicalMemory", 256 * 1024 * 1024L, totalPhysicalMemory); //$NON-NLS-1$
+ assertMin("TotalPhysicalMemory", 256 * 1024 * 1024L, totalPhysicalMemory);
} catch (Exception e) {
fail(e.getMessage());
}
@@ -91,9 +91,9 @@
public void testGetUsedPhysicalMemory() {
try {
Object data = getMBeanServerConnection().getAttribute(ConnectionToolkit.OPERATING_SYSTEM_BEAN_NAME,
- "UsedPhysicalMemorySize"); //$NON-NLS-1$
+ "UsedPhysicalMemorySize");
long usedPhysicalMemory = ((Number) data).longValue();
- assertMin("UsedPhysicalMemory", 16 * 1024 * 1024L, usedPhysicalMemory); //$NON-NLS-1$
+ assertMin("UsedPhysicalMemory", 16 * 1024 * 1024L, usedPhysicalMemory);
} catch (Exception e) {
fail(e.getMessage());
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JmxThreadTest.java 2019-02-27 20:12:40.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/JmxThreadTest.java 2019-02-27 20:12:40.000000000 +0100
@@ -53,7 +53,7 @@
} catch (Exception e) {
fail(e.toString());
}
- assertMin("Should at least have started one thread!", 1, startedThread); //$NON-NLS-1$
+ assertMin("Should at least have started one thread!", 1, startedThread);
} catch (Exception e) {
fail(e.getMessage());
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MRIMetadataServiceTest.java 2019-02-27 20:12:41.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MRIMetadataServiceTest.java 2019-02-27 20:12:41.000000000 +0100
@@ -59,16 +59,16 @@
* Tests the basic functionality of the {@link IMRIMetadataService}.
*/
public class MRIMetadataServiceTest extends RjmxTestCase {
- private static final String MOOH = "Mooh!"; //$NON-NLS-1$
- private static final String MY_COW = "MyCow"; //$NON-NLS-1$
+ private static final String MOOH = "Mooh!";
+ private static final String MY_COW = "MyCow";
@Test
public void testGetAttributeInfo() throws Exception {
@SuppressWarnings("nls")
IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "SystemCpuLoad")); //$NON-NLS-1$
+ IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "SystemCpuLoad"));
assertNotNull(info);
assertNotNull(info.getMRI());
assertNotNull(info.getValueType());
@@ -78,10 +78,10 @@
@Test
public void testGetMetadata() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "SystemCpuLoad")); //$NON-NLS-1$
+ IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "SystemCpuLoad"));
assertNotNull(info);
String description = info.getDescription();
@@ -92,22 +92,22 @@
@Test
public void testGetExtendedProperties() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
IMRIMetadata info = service
- .getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/used")); //$NON-NLS-1$ //$NON-NLS-2$
+ .getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/used"));
assertNotNull(info);
- assertTrue("Should be numerical", MRIMetadataToolkit.isNumerical(info)); //$NON-NLS-1$
- assertNotNull(info.getMetadata("color")); //$NON-NLS-1$
+ assertTrue("Should be numerical", MRIMetadataToolkit.isNumerical(info));
+ assertNotNull(info.getMetadata("color"));
}
@Test
public void testGetNumericalMetadata() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- evaluateNumericalMetadata(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"), false); //$NON-NLS-1$ //$NON-NLS-2$
+ evaluateNumericalMetadata(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"), false);
evaluateNumericalMetadata(service,
- new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed"), true); //$NON-NLS-1$ //$NON-NLS-2$
+ new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed"), true);
handle.close();
}
@@ -119,17 +119,17 @@
@Test
public void testAttributeTypes() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"), //$NON-NLS-1$ //$NON-NLS-2$
+ evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"),
MemoryUsage.class);
- evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed"), //$NON-NLS-1$ //$NON-NLS-2$
+ evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed"),
Long.TYPE);
- evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "JMImplementation:type=MBeanServerDelegate", //$NON-NLS-1$
- "ImplementationVendor"), String.class); //$NON-NLS-1$
- evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Runtime", "InputArguments"), //$NON-NLS-1$ //$NON-NLS-2$
+ evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "JMImplementation:type=MBeanServerDelegate",
+ "ImplementationVendor"), String.class);
+ evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Runtime", "InputArguments"),
List.class);
- evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Runtime", "SystemProperties"), //$NON-NLS-1$ //$NON-NLS-2$
+ evaluateAttributeType(service, new MRI(Type.ATTRIBUTE, "java.lang:type=Runtime", "SystemProperties"),
Map.class);
handle.close();
}
@@ -139,12 +139,12 @@
assertNotNull(info);
String typeName = stripGenericType(info.getValueType());
if (clazz.isPrimitive()) {
- assertTrue("Not assignable!", clazz.getName().equals(typeName)); //$NON-NLS-1$
+ assertTrue("Not assignable!", clazz.getName().equals(typeName));
} else {
try {
- assertTrue("Not assignable!", clazz.isAssignableFrom(Class.forName(typeName))); //$NON-NLS-1$
+ assertTrue("Not assignable!", clazz.isAssignableFrom(Class.forName(typeName)));
} catch (ClassNotFoundException e) {
- assertTrue("Could not instantiate metadata type " + typeName, false); //$NON-NLS-1$
+ assertTrue("Could not instantiate metadata type " + typeName, false);
}
}
}
@@ -160,28 +160,28 @@
@Test
public void testSetMetadata() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "SystemCpuLoad")); //$NON-NLS-1$
+ IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "SystemCpuLoad"));
assertNotNull(info);
- service.setMetadata(info.getMRI(), "testgegga", "Oh, testgegga!"); //$NON-NLS-1$ //$NON-NLS-2$
- String testGegga = (String) service.getMetadata(info.getMRI(), "testgegga"); //$NON-NLS-1$
- assertEquals("Oh, testgegga!", testGegga); //$NON-NLS-1$
+ service.setMetadata(info.getMRI(), "testgegga", "Oh, testgegga!");
+ String testGegga = (String) service.getMetadata(info.getMRI(), "testgegga");
+ assertEquals("Oh, testgegga!", testGegga);
handle.close();
}
@Test
public void testSetMetadataInDifferentConnections() throws Exception {
- Assume.assumeTrue("Will not pass until BUG XYZ is fixed", false); //$NON-NLS-1$
+ Assume.assumeTrue("Will not pass until BUG XYZ is fixed", false);
IConnectionHandle handle1 = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor())
- .connect("Test"); //$NON-NLS-1$
+ .connect("Test");
IConnectionHandle handle2 = IServerHandle.create(LocalRJMXTestToolkit.createAlternativeDescriptor())
- .connect("Test"); //$NON-NLS-1$
+ .connect("Test");
IMRIMetadataService service1 = LocalRJMXTestToolkit.getInfoService(handle1);
IMRIMetadataService service2 = LocalRJMXTestToolkit.getInfoService(handle2);
- MRI mri = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI mri = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad");
service1.setMetadata(mri, MY_COW, MOOH);
assertNotNull(service1.getMetadata(mri, MY_COW));
assertEquals(MOOH, service1.getMetadata(mri, MY_COW));
@@ -192,31 +192,31 @@
@Test
public void testOverrideDefultMetadata() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- MRI mri = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", //$NON-NLS-1$
- "HeapMemoryUsage/committed"); //$NON-NLS-1$
+ MRI mri = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory",
+ "HeapMemoryUsage/committed");
IMRIMetadata info = service.getMetadata(mri);
String description = info.getDescription();
- String newDescription = "[ja]" + description; //$NON-NLS-1$
+ String newDescription = "[ja]" + description;
service.setMetadata(mri, IMRIMetadataProvider.KEY_DESCRIPTION, newDescription);
- assertEquals("Description not updated", newDescription, info.getDescription()); //$NON-NLS-1$
+ assertEquals("Description not updated", newDescription, info.getDescription());
handle.close();
}
@Test
public void testCompositeIsChild() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
IMRIMetadataService service = LocalRJMXTestToolkit.getInfoService(handle);
- IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage")); //$NON-NLS-1$ //$NON-NLS-2$
- assertTrue("MRI is not composite!", MRIMetadataToolkit.isComposite(info)); //$NON-NLS-1$
+ IMRIMetadata info = service.getMetadata(new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"));
+ assertTrue("MRI is not composite!", MRIMetadataToolkit.isComposite(info));
int childCount = 0;
for (MRI mri : handle.getServiceOrThrow(IMRIService.class).getMRIs()) {
if (info.getMRI().isChild(mri)) {
childCount++;
}
}
- assertEquals("There is not four composite children!", 4, childCount); //$NON-NLS-1$
+ assertEquals("There is not four composite children!", 4, childCount);
handle.close();
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MRIMetadataToolkitTest.java 2019-02-27 20:12:42.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MRIMetadataToolkitTest.java 2019-02-27 20:12:41.000000000 +0100
@@ -43,9 +43,9 @@
@Test
public void testIsNumerical() {
- assertTrue(MRIMetadataToolkit.isNumerical("int")); //$NON-NLS-1$
- assertTrue(MRIMetadataToolkit.isNumerical("java.lang.Integer")); //$NON-NLS-1$
- assertFalse(MRIMetadataToolkit.isNumerical("gurka")); //$NON-NLS-1$
+ assertTrue(MRIMetadataToolkit.isNumerical("int"));
+ assertTrue(MRIMetadataToolkit.isNumerical("java.lang.Integer"));
+ assertFalse(MRIMetadataToolkit.isNumerical("gurka"));
}
}
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MultipleAttributeSubscriptionTest.java 2019-02-27 20:12:42.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/MultipleAttributeSubscriptionTest.java 2019-02-27 20:12:42.000000000 +0100
@@ -55,12 +55,12 @@
*/
@Test
public void testMultipleSubscriptions() throws Exception {
- IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test"); //$NON-NLS-1$
+ IConnectionHandle handle = IServerHandle.create(LocalRJMXTestToolkit.createDefaultDescriptor()).connect("Test");
ISubscriptionService service = handle.getServiceOrThrow(ISubscriptionService.class);
- MRI cpuAttributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI cpuAttributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "SystemCpuLoad");
service.addMRIValueListener(cpuAttributeDescriptor, this);
- MRI loadAttributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI loadAttributeDescriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "ProcessCpuLoad");
service.addMRIValueListener(loadAttributeDescriptor, this);
synchronized (this) {
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/NotificationAttributeSubscriptionTest.java 2019-02-27 20:12:43.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/NotificationAttributeSubscriptionTest.java 2019-02-27 20:12:43.000000000 +0100
@@ -64,8 +64,8 @@
MRI descriptor = null;
synchronized (this) {
// Starting up a subscription on a one shot attribute.
- descriptor = new MRI(Type.NOTIFICATION, "com.sun.management:type=GarbageCollectionAggregator", //$NON-NLS-1$
- "com.sun.management.gc.notification"); //$NON-NLS-1$
+ descriptor = new MRI(Type.NOTIFICATION, "com.sun.management:type=GarbageCollectionAggregator",
+ "com.sun.management.gc.notification");
getAttributeSubscriptionService().addMRIValueListener(descriptor, this);
secondThreadException = null;
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/ConsoleAttributeInfoManagerTest.java 2019-02-27 20:12:44.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/ConsoleAttributeInfoManagerTest.java 2019-02-27 20:12:44.000000000 +0100
@@ -57,29 +57,29 @@
@Test
public void testGetAttributeInfo() {
- MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", //$NON-NLS-1$
- "AvailableProcessors"); //$NON-NLS-1$
+ MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem",
+ "AvailableProcessors");
IMRIMetadata info = m_manager.getMetadata(descriptor);
assertNotNull(info);
assertEquals(5000,
((IIntervalUpdatePolicy) UpdatePolicyToolkit.getUpdatePolicy(m_connectionHandle, info.getMRI()))
.getIntervalTime());
- assertMin("Description shorter than expected.", 10, info.getDescription().length()); //$NON-NLS-1$
- assertMin("Display name shorter than expected.", 4, MRIMetadataToolkit.getDisplayName(m_connectionHandle, //$NON-NLS-1$
+ assertMin("Description shorter than expected.", 10, info.getDescription().length());
+ assertMin("Display name shorter than expected.", 4, MRIMetadataToolkit.getDisplayName(m_connectionHandle,
info.getMRI()).length());
assertTrue(info.getMRI().getParentMRIs().length == 0);
}
@Test
public void testCompositeIsChild() {
- MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI descriptor = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage/committed");
IMRIMetadata info = m_manager.getMetadata(descriptor);
assertNotNull(info);
- MRI parent = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage"); //$NON-NLS-1$ //$NON-NLS-2$
+ MRI parent = new MRI(Type.ATTRIBUTE, "java.lang:type=Memory", "HeapMemoryUsage");
IMRIMetadata parentInfo = m_manager.getMetadata(parent);
assertNotNull(parentInfo);
- assertTrue("Info not child to parent!", parent.isChild(descriptor)); //$NON-NLS-1$
+ assertTrue("Info not child to parent!", parent.isChild(descriptor));
}
@Before
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/DummyConnectionHandle.java 2019-02-27 20:12:44.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/DummyConnectionHandle.java 2019-02-27 20:12:44.000000000 +0100
@@ -60,8 +60,8 @@
* we would like to check this at compile time, but there was no way to do that yet. JSR
* 308 and the Checker Framework should change that.)
*/
- throw new IllegalArgumentException("Will not be able to create dummy implementations of " //$NON-NLS-1$
- + serviceInterface.getName() + " since the service is not an interface"); //$NON-NLS-1$
+ throw new IllegalArgumentException("Will not be able to create dummy implementations of "
+ + serviceInterface.getName() + " since the service is not an interface");
}
T service = getServiceOrNull(serviceInterface);
if (service == null) {
@@ -119,7 +119,7 @@
@Override
public String getDescription() {
- return "Dummy"; //$NON-NLS-1$
+ return "Dummy";
}
@Override
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/UpdatePolicyTest.java 2019-02-27 20:12:45.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/subscription/internal/UpdatePolicyTest.java 2019-02-27 20:12:45.000000000 +0100
@@ -67,7 +67,7 @@
private void helpUpdatePolicyLookup(MRI mri) throws Exception {
IUpdatePolicy policy = UpdatePolicyToolkit.getUpdatePolicy(getConnectionHandle(), mri);
- assertNotNull("Policy is null!", policy); //$NON-NLS-1$
+ assertNotNull("Policy is null!", policy);
}
@Test
@@ -170,11 +170,11 @@
}
private MRI getExistingAttribute() {
- return new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "UsedPhysicalMemorySize"); //$NON-NLS-1$ //$NON-NLS-2$
+ return new MRI(Type.ATTRIBUTE, "java.lang:type=OperatingSystem", "UsedPhysicalMemorySize");
}
private MRI getNonExistingAttribute() {
- return new MRI(Type.ATTRIBUTE, "this.could.possible.not:really=exist,as=an", "attribute"); //$NON-NLS-1$ //$NON-NLS-2$
+ return new MRI(Type.ATTRIBUTE, "this.could.possible.not:really=exist,as=an", "attribute");
}
@Override
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/synthetic/PropertyTestAttribute.java 2019-02-27 20:12:46.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/synthetic/PropertyTestAttribute.java 2019-02-27 20:12:46.000000000 +0100
@@ -49,7 +49,7 @@
@Override
public void setValue(MBeanServerConnection connection, Object value) {
- throw new AssertionError("Not writeable!"); //$NON-NLS-1$
+ throw new AssertionError("Not writeable!");
}
@Override
--- old/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/synthetic/SyntheticAttributesTest.java 2019-02-27 20:12:46.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/src/test/java/org/openjdk/jmc/rjmx/test/synthetic/SyntheticAttributesTest.java 2019-02-27 20:12:46.000000000 +0100
@@ -61,43 +61,43 @@
import org.openjdk.jmc.rjmx.test.ServerHandleTestCase;
public class SyntheticAttributesTest extends ServerHandleTestCase {
- private final static String NEW_VALUE = "new value"; //$NON-NLS-1$
+ private final static String NEW_VALUE = "new value";
protected IConnectionHandle localConnection;
@Test
public void testLookupDomain() throws Exception {
- assertTrue("Could not find the test domain!", containsDomain("org.openjdk.jmc.test")); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Could not find the test domain!", containsDomain("org.openjdk.jmc.test"));
}
@Test
public void testFindNonSyntheticDomain() throws Exception {
- assertTrue("Could not find the java.lang domain!", containsDomain("java.lang")); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Could not find the java.lang domain!", containsDomain("java.lang"));
}
@Test
public void testFindMBean() throws Exception {
ObjectName mbean = getSyntheticAttributeDescriptor().getObjectName();
- assertTrue("Could not find the test mbean!", containsMBean(mbean)); //$NON-NLS-1$
+ assertTrue("Could not find the test mbean!", containsMBean(mbean));
}
@Test
public void testFindNonSyntheticMBean() throws Exception {
- ObjectName mbean = new ObjectName("java.lang:type=Runtime"); //$NON-NLS-1$
- assertTrue("Could not find the Runtime mbean!", containsMBean(mbean)); //$NON-NLS-1$
+ ObjectName mbean = new ObjectName("java.lang:type=Runtime");
+ assertTrue("Could not find the Runtime mbean!", containsMBean(mbean));
}
@Test
public void testGetAttribute() throws Exception {
MRI descriptor = getSyntheticAttributeDescriptor();
Object value = getAttributeValue(descriptor);
- assertNotNull("Could not retrieve the attribute value", value); //$NON-NLS-1$
+ assertNotNull("Could not retrieve the attribute value", value);
}
@Test
public void testGetCompositeAttribute() throws Exception {
MRI descriptor = getCompositeAttributeDescriptor();
Object value = getAttributeValue(descriptor);
- assertNotNull("Could not retrieve the attribute value", value); //$NON-NLS-1$
+ assertNotNull("Could not retrieve the attribute value", value);
}
@Test
@@ -105,7 +105,7 @@
MRI descriptor = getSyntheticAttributeDescriptor();
AttributeList list = getAttributeValues(descriptor.getObjectName(), new String[] {descriptor.getDataPath()});
Object value = list.get(0);
- assertNotNull("Could not retrieve the attribute value", value); //$NON-NLS-1$
+ assertNotNull("Could not retrieve the attribute value", value);
}
@Test
@@ -117,7 +117,7 @@
names.add(ad.getDataPath());
}
AttributeList list = getAttributeValues(objectName, names.toArray(new String[descriptors.length]));
- assertEquals("Could not retrieve all values", descriptors.length, list.size()); //$NON-NLS-1$
+ assertEquals("Could not retrieve all values", descriptors.length, list.size());
}
@Test
@@ -129,7 +129,7 @@
names.add(ad.getDataPath());
}
Collection