diff options
Diffstat (limited to 'dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse')
25 files changed, 242 insertions, 242 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java index 2ecca984887..e4bdc6edcdd 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java @@ -127,7 +127,7 @@ public class BaseTestCase { // This allows a SuiteGdb to set an attribute // The suite is responsible for clearing those attributes // once it is finished - private static Map<String, Object> globalLaunchAttributes = new HashMap<String, Object>(); + private static Map<String, Object> globalLaunchAttributes = new HashMap<>(); private static Process gdbserverProc; @@ -362,7 +362,7 @@ public class BaseTestCase { protected void setLaunchAttributes() { // Clear all launch attributes before starting a new test - launchAttributes = new HashMap<String, Object>(); + launchAttributes = new HashMap<>(); launchAttributes.put(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EXEC_PATH + DEFAULT_EXEC_NAME); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java index ca2f1fd3fa1..bf63f193a12 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java @@ -36,7 +36,7 @@ import org.junit.runners.model.RunnerBuilder; */ @SuppressWarnings("restriction") public class OnceOnlySuite extends Suite { - private static Set<Class<?>> alreadySeen = new HashSet<Class<?>>(); + private static Set<Class<?>> alreadySeen = new HashSet<>(); public OnceOnlySuite(Class<?> testClass, final RunnerBuilder builder) throws InitializationError { super(testClass, new RunnerBuilder() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java index f1bfeef0c02..5528b8cddeb 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java @@ -106,7 +106,7 @@ public class ServiceEventWaitor<V> { */ public synchronized List<V> waitForEvents(int period) { long startMs = System.currentTimeMillis(); - List<V> events = new ArrayList<V>(); + List<V> events = new ArrayList<>(); //Timeout exception will exit the loop and return the resulting list of events while (true) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java index 1c1c7338e01..74042b75e41 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java @@ -170,7 +170,7 @@ public class SyncUtil { public static MIStoppedEvent step(final IExecutionDMContext dmc, final StepType stepType, boolean reverse, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); if (!reverse) { @@ -280,7 +280,7 @@ public class SyncUtil { private static MIStoppedEvent resumeUntilStopped(final IExecutionDMContext dmc, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); fRunControl.getExecutor().submit(new Runnable() { @@ -308,7 +308,7 @@ public class SyncUtil { } public static MIRunningEvent resume(final IExecutionDMContext dmc, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>(fSession, + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIRunningEvent.class); fRunControl.getExecutor().submit(new Runnable() { @@ -378,7 +378,7 @@ public class SyncUtil { // if there is a sleep in the code between the resume and the time // it stops; this will give us plenty of time to call this method. public static MIStoppedEvent waitForStop(int timeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); // Wait for the execution to suspend @@ -592,7 +592,7 @@ public class SyncUtil { * we allows 10 seconds, which is probably ample in most cases. Tests * can provide larger values as needed in specific SyncUtil calls. */ - private static Map<ETimeout, Integer> sTimeouts = new HashMap<ETimeout, Integer>(); + private static Map<ETimeout, Integer> sTimeouts = new HashMap<>(); static { sTimeouts.put(ETimeout.addBreakpoint, 1000); sTimeouts.put(ETimeout.deleteBreakpoint, 1000); @@ -778,7 +778,7 @@ public class SyncUtil { } // Now wait for the stopped event of the restart - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); // Perform the restart @@ -815,7 +815,7 @@ public class SyncUtil { protected void handleCompleted() { if (isSuccess()) { IVariableDMContext[] varDmcs = getData(); - final List<IVariableDMData> localsDMData = new ArrayList<IVariableDMData>(); + final List<IVariableDMData> localsDMData = new ArrayList<>(); final CountingRequestMonitor crm = new CountingRequestMonitor( ImmediateExecutor.getInstance(), rm) { @Override @@ -876,7 +876,7 @@ public class SyncUtil { // Remove registers with empty names since the service also // remove them. I don't know why GDB returns such empty names. - List<String> registerNames = new LinkedList<String>(); + List<String> registerNames = new LinkedList<>(); for (String name : names) { if (!name.isEmpty()) { registerNames.add(name); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java index 63f7e196b64..7555b477977 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java @@ -97,7 +97,7 @@ public class CommandTimeoutTest extends BaseParametrizedTestCase { doLaunch(); final DsfSession session = getGDBLaunch().getSession(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( session, ICommandControlShutdownDMEvent.class); // Send the command that will timeout diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java index bdea8c196e0..1ad33dc43e7 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java @@ -113,7 +113,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { private IBreakpoints fBreakpointService; private MIBreakpointsSynchronizer fBreakpointsSynchronizer; - private List<IBreakpointsChangedEvent> fBreakpointEvents = new ArrayList<IBreakpointsChangedEvent>(); + private List<IBreakpointsChangedEvent> fBreakpointEvents = new ArrayList<>(); @Override @Before @@ -819,7 +819,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { } private Map<String, Object> getLocationBreakpointAttributes(Class<? extends ICBreakpoint> type, boolean valid) { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); if (ICFunctionBreakpoint.class.equals(type)) { map.put(ATTR_FILE_NAME, (valid) ? SOURCE_NAME_VALID : SOURCE_NAME_INVALID); map.put(ATTR_FUNCTION, (valid) ? FUNCTION_VALID : FUNCTION_INVALID); @@ -837,7 +837,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { public Map<String, Object> getWatchpointAttributes(Class<? extends ICWatchpoint> type, boolean read, boolean write) throws Throwable { Assert.assertTrue(read || write); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put(ATTR_EXPRESSION, EXPRESSION_VALID); map.put(ATTR_READ, Boolean.valueOf(read)); map.put(ATTR_WRITE, Boolean.valueOf(write)); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java index e9d67881067..cb4ed53ace9 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java @@ -75,7 +75,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase { private IExpressions fExprService; private IRunControl fRunControl; - private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<IDMEvent<? extends IDMContext>>(); + private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<>(); @Override protected void setLaunchAttributes() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java index 1bd1b8242bf..3d359d35006 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java @@ -1500,7 +1500,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase @Test public void testGroupGetSubExpressions() throws Throwable { final String exprString = "$eax;*"; - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); list.add("$eax"); list.addAll(Arrays.asList(fAllVariables)); final String[] children = list.toArray(new String[list.size()]); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java index 1c5aa1baa81..71dbd000b33 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java @@ -659,7 +659,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { getLineForTag("4_BYTE"), getLineForTag("5_BYTE") }; for (int i = 0; i < lineNumbers.length; i++) { - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, lineNumbers[i]); @@ -739,7 +739,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { passed.add(byteCount); } } - assertEquals("Some byte length were not seen", new HashSet<Integer>(Arrays.asList(1, 2, 3, 4, 5)), passed); + assertEquals("Some byte length were not seen", new HashSet<>(Arrays.asList(1, 2, 3, 4, 5)), passed); } catch (AssertionError | Exception e) { throw new AssertionError( "Failed to verify instruction lengths. Output from GDB's disassemble:\n" + miInfo.toString(), e); @@ -785,7 +785,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void disableTracepoints() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.IS_ENABLED, false); // Disable all tracepoints for (IBreakpointDMContext tp : fTracepoints) { @@ -804,7 +804,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void enableTracepoints() throws Throwable { disableTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.IS_ENABLED, true); // Enable all tracepoints for (IBreakpointDMContext tp : fTracepoints) { @@ -823,7 +823,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointPasscount() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set passcount for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -844,7 +844,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointCondition() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -865,7 +865,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointActions() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -949,7 +949,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { getLineForTag("4_BYTE"), getLineForTag("5_BYTE") }; for (int i = 0; i < lineNumbers.length; i++) { - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, lineNumbers[i]); @@ -1237,7 +1237,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints delta.put(MIBreakpoints.COMMANDS, action1.getName()); updateBreakpoint(fTracepoints[0], delta); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java index 1d35a5374a3..acf45f16b1d 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java @@ -331,7 +331,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase public void testSettingEnvironment() throws Throwable { setLaunchAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true); - Map<String, String> map = new HashMap<String, String>(1); + Map<String, String> map = new HashMap<>(1); map.put("LAUNCHTEST", "IS SET"); setLaunchAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, map); doLaunch(); @@ -392,7 +392,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase public void testClearingAndSettingEnvironment() throws Throwable { setLaunchAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, false); - Map<String, String> map = new HashMap<String, String>(1); + Map<String, String> map = new HashMap<>(1); map.put("LAUNCHTEST", "IS SET"); setLaunchAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, map); doLaunch(); @@ -596,7 +596,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_3); doLaunch(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // The target is currently stopped. We resume to get it running @@ -714,7 +714,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase // Now step backwards to make sure reverse was enabled - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 2; @@ -780,7 +780,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase frame.getFunction().equals("stopAtOther")); // Now step backwards all the way to the start to make sure reverse was enabled from the very start - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 3; @@ -854,7 +854,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase frame.getFunction().equals("main") && frame.getLine() == LAST_LINE_IN_MAIN); // Now step backwards all the way to the start to make sure reverse was enabled from the very start - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 3; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java index b287e4d6073..18cce53ce65 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java @@ -484,7 +484,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { private IBreakpointDMContext insertAndRunToLineBreakpoint(int lineNumber) throws Throwable { clearEventCounters(); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, lineNumber); @@ -800,7 +800,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_InvalidContext() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -820,7 +820,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFileName() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_6_8); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME + "_bad"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -840,7 +840,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidLineNumber() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_7_4); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, 0); @@ -860,7 +860,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFunctionName() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_6_8); // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, "invalid-function-name"); @@ -879,7 +879,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_InvalidAddress() throws Throwable { // Create an address breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(ADDRESS_TAG, "0x0z"); @@ -899,7 +899,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Address() throws Throwable { // Create an address breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); final BigInteger ADDRESS = new BigInteger("00affe00", 16); breakpoint.put(ADDRESS_TAG, "0x" + ADDRESS.toString(16)); @@ -933,7 +933,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_LineNumber() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -968,7 +968,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Disabled() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1004,7 +1004,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_FunctionName() throws Throwable { // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -1039,7 +1039,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Condition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1075,7 +1075,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_IgnoreCnt() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1111,7 +1111,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_MultipleBreakpoints() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1131,7 +1131,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { validateBreakpoint(breakpoint1, SOURCE_NAME, LINE_NUMBER_1, NO_CONDITION, 0, true, false); // Create a function breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -1177,7 +1177,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Duplicate() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1247,7 +1247,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1298,7 +1298,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, "Bad file name"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1343,7 +1343,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Write() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -1378,7 +1378,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Read() throws Throwable { // Create a read watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -1413,7 +1413,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Access() throws Throwable { // Create an access watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -1458,7 +1458,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_3); watchpoint.put(WRITE_TAG, true); @@ -1506,7 +1506,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void removeBreakpoint_SimpleCase() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1553,7 +1553,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received " + fBreakpointEventCount, fBreakpointEventCount == 0); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1631,7 +1631,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void removeBreakpoint_MixedCase() throws Throwable { // Create a line breakpoint for (int i = 0; i < 4; i++) { - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1 + i); @@ -1695,7 +1695,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1740,7 +1740,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext invalid_ref = new MIBreakpointDMContext((MIBreakpoints) fBreakpointService, new IDMContext[] { fBreakpointsDmc }, "0.0"); // Update the invalid breakpoint - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); properties.put(FILE_NAME_TAG, SOURCE_NAME); properties.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1760,7 +1760,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_AddCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1775,7 +1775,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Modify the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -1800,7 +1800,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_RemoveCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1816,7 +1816,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, null); updateBreakpoint(ref, delta); @@ -1841,7 +1841,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_ModifyCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1857,7 +1857,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_2); updateBreakpoint(ref, delta); @@ -1891,7 +1891,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1907,7 +1907,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_5); // Run the program SyncUtil.resume(); @@ -1944,7 +1944,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -1959,7 +1959,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -1986,7 +1986,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2002,7 +2002,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, null); updateBreakpoint(ref, delta); @@ -2029,7 +2029,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2045,7 +2045,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_2); updateBreakpoint(ref, delta); @@ -2070,7 +2070,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_AddCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2085,7 +2085,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2110,7 +2110,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_RemoveCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2126,7 +2126,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, null); updateBreakpoint(ref, delta); @@ -2150,7 +2150,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_ModifyCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2166,7 +2166,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2200,7 +2200,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2216,7 +2216,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to update the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, 0); // Run the program SyncUtil.resume(); @@ -2250,7 +2250,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_Disable() throws Throwable { // Create a first line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2258,7 +2258,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext ref1 = insertBreakpoint(fBreakpointsDmc, breakpoint); // Create a second line breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_2); @@ -2278,7 +2278,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint state error", breakpoint1.isEnabled() && breakpoint2.isEnabled()); // Disable the first breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); updateBreakpoint(ref1, delta); @@ -2323,7 +2323,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2342,7 +2342,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 2); clearEventCounters(); // Prepare to disable the breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); // Run the program SyncUtil.resume(); @@ -2371,7 +2371,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_Enable() throws Throwable { // Create a first line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2379,7 +2379,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext ref1 = insertBreakpoint(fBreakpointsDmc, breakpoint); // Create a second line breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_2); @@ -2399,7 +2399,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint state error", breakpoint1.isEnabled() && breakpoint2.isEnabled()); // Disable the first breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); updateBreakpoint(ref1, delta); @@ -2426,7 +2426,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint mismatch", fBreakpointRef.equals(breakpoint2.getNumber())); clearEventCounters(); // Enable the first breakpoint - delta = new HashMap<String, Object>(); + delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, true); updateBreakpoint(ref1, delta); @@ -2471,7 +2471,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2487,7 +2487,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to enable the breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, true); // Run the program SyncUtil.resume(); @@ -2621,7 +2621,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_LineNumber() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2656,7 +2656,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Function() throws Throwable { // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -2693,7 +2693,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Condition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2735,7 +2735,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_UpdatedCondition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2750,7 +2750,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -2788,7 +2788,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Count() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2830,7 +2830,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_UpdatedCount() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2845,7 +2845,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2882,7 +2882,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_WriteWatchpoint() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2922,7 +2922,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_ReadWatchpoint() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -2962,7 +2962,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_AccessWatchpoint() throws Throwable { // Create an access watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -3005,7 +3005,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(WRITE_TAG, true); @@ -3020,7 +3020,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -3063,7 +3063,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(WRITE_TAG, true); @@ -3078,7 +3078,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_3); updateBreakpoint(ref, delta); @@ -3118,7 +3118,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(READ_TAG, true); @@ -3166,7 +3166,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidLineNumberPending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, 0); @@ -3191,7 +3191,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFileNamePending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8); // Create an invalid line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME + "_bad"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -3238,7 +3238,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFunctionNamePending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8); // Create an invalid function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, "invalid-function-name"); @@ -3293,7 +3293,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { } // Create an invalid line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, "Bad file name"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java index 2ab9794c660..2eaac4b4c8d 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java @@ -595,7 +595,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { public void insertCatchpoint_InvalidContext() throws Throwable { // Attempt to create a catchpoint with an invalid execution context (should fail) - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); breakpoint.put(MIBreakpoints.CATCHPOINT_TYPE, "throw"); insertBreakpoint(null, breakpoint); @@ -769,7 +769,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { // Set a throw catchpoint; don't use the utility method since it assumes // the target is running - Map<String, Object> bkptsProps = new HashMap<String, Object>(); + Map<String, Object> bkptsProps = new HashMap<>(); bkptsProps.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); bkptsProps.put(MIBreakpoints.CATCHPOINT_TYPE, "throw"); insertBreakpoint(fBreakpointsDmc, bkptsProps); @@ -1289,7 +1289,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext[] bkptsBefore = getBreakpoints(fBreakpointsDmc); // Set the breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); breakpoint.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); breakpoint.put(MIBreakpoints.LINE_NUMBER, lineNumber); @@ -1302,7 +1302,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { assertEquals("Unexpected number of breakpoint-added events", 1, getBreakpointEventCount(BP_ADDED)); // Ensure the breakpoint service sees what we expect - List<IBreakpointDMContext> bkptsAfter = new LinkedList<IBreakpointDMContext>( + List<IBreakpointDMContext> bkptsAfter = new LinkedList<>( Arrays.asList(getBreakpoints(fBreakpointsDmc))); assertEquals("Breakpoints service reports unexpected number of breakpoints", bkptsBefore.length + 1, bkptsAfter.size()); @@ -1341,7 +1341,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext[] bkptsBefore = getBreakpoints(fBreakpointsDmc); // set the catchpoint - Map<String, Object> bkptsProps = new HashMap<String, Object>(); + Map<String, Object> bkptsProps = new HashMap<>(); bkptsProps.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); bkptsProps.put(MIBreakpoints.CATCHPOINT_TYPE, event); if (condition != null) { @@ -1361,7 +1361,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { // Ensure the breakpoint service sees what we expect. Ask the breakpoint // service for the list of breakpoint against and make sure it differs // only by the newly added one - List<IBreakpointDMContext> bkptsAfter = new LinkedList<IBreakpointDMContext>( + List<IBreakpointDMContext> bkptsAfter = new LinkedList<>( Arrays.asList(getBreakpoints(fBreakpointsDmc))); assertEquals("Breakpoints service reports unexpected number of breakpoints", bkptsBefore.length + 1, bkptsAfter.size()); @@ -1432,7 +1432,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { private void modifyBkptProperty(IBreakpointDMContext bkptRef, String property, Object value) throws Throwable { // Modify the catchpoint to not have an ignore count clearEventCounters(); - Map<String, Object> bkptProps = new HashMap<String, Object>(); + Map<String, Object> bkptProps = new HashMap<>(); bkptProps.put(property, value); updateBreakpoint(bkptRef, bkptProps); assertTrue(fWait.getMessage(), fWait.isOK()); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java index c9151a40fdd..bfed2af26bb 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java @@ -166,7 +166,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testLocals"); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("0 + 0 - 0", new String[] { "0x0", "0", "0", "0", "0", "0" }); tests.put("3 + 4", new String[] { "0x7", "07", "111", "7", "7", "7" }); @@ -189,7 +189,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testLocals"); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("3.14159 + 1.1111", new String[] { "0x4", "04", "100", "4", "4.2526", "4.2526" }); tests.put("100.0 / 3.0", new String[] { "0x21", "041", "100001", "33", "33.3333", "33.3333" }); @@ -215,7 +215,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(16, StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests1 = new HashMap<String, String[]>(); + Map<String, String[]> tests1 = new HashMap<>(); tests1.put("lIntVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345", "12345" }); tests1.put("lDoubleVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345.123449999999", @@ -251,7 +251,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { stoppedEvent = SyncUtil.step(5, StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests2 = new HashMap<String, String[]>(); + Map<String, String[]> tests2 = new HashMap<>(); tests2.put("lIntVar", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789", "6789" }); tests2.put("lDoubleArray[1]", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789.6788999999999", @@ -284,7 +284,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(2, StepType.STEP_OVER); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x8", "010", "1000", "8", "8", "8" }); tests.put("b", new String[] { "0x1", "01", "1", "1", "1", "1" }); @@ -294,7 +294,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // Now enter a subblock with the same variable names SyncUtil.step(2, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0xc", "014", "1100", "12", "12", "12" }); tests.put("b", new String[] { "0x1", "01", "1", "1", "1", "1" }); @@ -304,7 +304,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // Now step to change the b variable SyncUtil.step(1, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0xc", "014", "1100", "12", "12", "12" }); tests.put("b", new String[] { "0xc", "014", "1100", "12", "12", "12" }); @@ -315,7 +315,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // same b SyncUtil.step(1, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x8", "010", "1000", "8", "8", "8" }); tests.put("b", new String[] { "0xc", "014", "1100", "12", "12", "12" }); @@ -1394,7 +1394,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("locals2"); // Create a map of expressions to expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); // Global variables tests.put("gIntVar", new String[] { "0x21F", "01037", "1000011111", "543", "543", "543" }); @@ -1440,21 +1440,21 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x1", "01", "1", "1", "1", "1" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.runToLocation("testName2"); stoppedEvent = SyncUtil.step(1, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x2", "02", "10", "2", "2", "2" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.runToLocation("testName1"); stoppedEvent = SyncUtil.step(1, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x3", "03", "11", "3", "3", "3" }); executeExpressionSubTests(tests, frameDmc); } @@ -1469,21 +1469,21 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x1", "01", "1", "1", "1", "1" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.step(StepType.STEP_RETURN); stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x2", "02", "10", "2", "2", "2" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.step(StepType.STEP_RETURN); stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x3", "03", "11", "3", "3", "3" }); executeExpressionSubTests(tests, frameDmc); } @@ -1500,7 +1500,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); // First make sure we have a different value on the other stack frame and that we select // a frame that is not the top frame @@ -1508,7 +1508,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { executeExpressionSubTests(tests, SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 1)); // Now check that we get the same values as the top stack when selecting the thread only - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("lIntVar", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789", "6789" }); executeExpressionSubTests(tests, stoppedEvent.getDMContext()); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java index e73002eb40c..08d58fdbaab 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java @@ -1164,7 +1164,7 @@ public class MIMemoryTest extends BaseParametrizedTestCase { } // Write asynchronously - ServiceEventWaitor<IMemoryChangedEvent> eventWaitor = new ServiceEventWaitor<IMemoryChangedEvent>(fSession, + ServiceEventWaitor<IMemoryChangedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, IMemoryChangedEvent.class); MemoryWriteQuery writeQueries[] = new MemoryWriteQuery[BLOCK_SIZE]; for (int offset = 0; offset < BLOCK_SIZE; offset++) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java index 87e81666074..10d47f175a5 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java @@ -224,7 +224,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase { private void resumeContainerContextExe() throws InterruptedException, ExecutionException, TimeoutException { - final ServiceEventWaitor<IResumedDMEvent> resumedWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> resumedWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); Query<Void> query = new Query<Void>() { @@ -268,7 +268,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase { */ private void interruptRunningTargetExe() throws InterruptedException, Exception, ExecutionException, TimeoutException { - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); Query<MIInfo> requestSuspend = new Query<MIInfo>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index 69f6bd79273..3118defa988 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -413,7 +413,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase { */ private List<IRegistersChangedDMEvent> writeRegisterWaitNotication(final IRegisterDMContext registerDmc, final String regValue, final String formatId) throws Throwable { - ServiceEventWaitor<IRegistersChangedDMEvent> eventWaitor = new ServiceEventWaitor<IRegistersChangedDMEvent>( + ServiceEventWaitor<IRegistersChangedDMEvent> eventWaitor = new ServiceEventWaitor<>( fSession, IRegistersChangedDMEvent.class); writeRegister(registerDmc, regValue, formatId); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java index 97504bc5132..50cb3ae547e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java @@ -129,7 +129,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Now resume the target and check that we stop at the breakpoint. - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -159,7 +159,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -236,7 +236,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Now resume the target three times and check that we stop three times. for (int i = 0; i < steps.length; i++) { - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -351,7 +351,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -372,7 +372,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Wait up to 3 second for the target to suspend. Should happen within two seconds. suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -425,7 +425,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -505,7 +505,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < steps.length; i++) { // Now resume the target and check that we stop at all the breakpoints. - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -542,7 +542,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -575,7 +575,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -636,7 +636,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < 2; i++) { // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -686,7 +686,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -707,7 +707,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -766,7 +766,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < 2; i++) { // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -814,7 +814,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -835,7 +835,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java index f14babb9ccf..d19784ef8dc 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java @@ -241,7 +241,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { ctxts.length); // The ordering of the contexts is not deterministic - LinkedList<Integer> ids = new LinkedList<Integer>(Arrays.asList(new Integer[] { 1 })); + LinkedList<Integer> ids = new LinkedList<>(Arrays.asList(new Integer[] { 1 })); if (sProgramIsCygwin) { ids.add(2); } @@ -277,7 +277,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { }; // Prepare a waiter to make sure we have received the thread started event - final ServiceEventWaitor<IStartedDMEvent> startedEventWaitor = new ServiceEventWaitor<IStartedDMEvent>( + final ServiceEventWaitor<IStartedDMEvent> startedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IStartedDMEvent.class); SyncUtil.runToLocation(SOURCE_NAME + ':' + getLineForTag("LINE_MAIN_AFTER_THREAD_START")); @@ -316,7 +316,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { Assert.assertEquals("Unexpected number of threads", sProgramIsCygwin ? 3 : 2, data.length); // The ordering of the contexts is not deterministic - LinkedList<Integer> ids = new LinkedList<Integer>(Arrays.asList(new Integer[] { 1, 2 })); + LinkedList<Integer> ids = new LinkedList<>(Arrays.asList(new Integer[] { 1, 2 })); if (sProgramIsCygwin) { ids.add(3); } @@ -580,7 +580,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { //TestsPlugin.debug("handleCompleted over"); } }; - final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); @@ -629,7 +629,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { } }; - final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); fRunCtrl.getExecutor().submit(new Runnable() { @@ -682,7 +682,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { public void runToLine() throws Throwable { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); fRunCtrl.getExecutor().submit(new Runnable() { @@ -726,7 +726,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { public void interruptRunningTarget() throws Throwable { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); // Resume the target diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java index 958324ee03f..2d5d7303c3f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java @@ -177,7 +177,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we terminate, and confirm that we shutdown right away SyncUtil.resume(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // Don't use a query here. The terminate, because it kills GDB, may not return right away @@ -215,7 +215,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we terminate the process, and confirm that there are no more processes SyncUtil.resume(); - ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<IExitedDMEvent>( + ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IExitedDMEvent.class); Query<Object> query = new Query<Object>() { @@ -260,7 +260,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we detach the process, and confirm that we are shutdown SyncUtil.resume(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // Don't use a query here. Because GDB will be killed, the call to detach may not return right away @@ -297,7 +297,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we detach the process, and confirm that we are not longer running SyncUtil.resume(); - ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<IExitedDMEvent>( + ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IExitedDMEvent.class); Query<Object> query = new Query<Object>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java index 4ad84e4fc14..2559a9104ef 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java @@ -320,7 +320,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("0 + 0 - 0", new String[] { "0x0", "0", "0", "0", "0", "0" }); tests.put("3 + 4", new String[] { "0x7", "07", "111", "7", "7", "7" }); @@ -343,7 +343,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("3.14159 + 1.1111", new String[] { "0x4", "04", "100", "4", "4.2526", "4.2526" }); tests.put("100.0 / 3.0", new String[] { "0x21", "041", "100001", "33", "33.3333", "33.3333" }); @@ -367,7 +367,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions to expected values. - Map<String, String[]> tests1 = new HashMap<String, String[]>(); + Map<String, String[]> tests1 = new HashMap<>(); tests1.put("lIntVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345", "12345" }); tests1.put("lDoubleVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345.123449999999", diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java index c47f654d26b..297b5f211b4 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java @@ -353,7 +353,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase { protected void addSourceContainer(AbstractSourceLookupDirector director, ISourceContainer container) throws CoreException { - ArrayList<ISourceContainer> containerList = new ArrayList<ISourceContainer>( + ArrayList<ISourceContainer> containerList = new ArrayList<>( Arrays.asList(director.getSourceContainers())); container.init(director); containerList.add(container); @@ -375,7 +375,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase { } else { mapContainer.addMapEntry(fMapEntrySourceContainerN); } - ArrayList<ISourceContainer> containerList = new ArrayList<ISourceContainer>( + ArrayList<ISourceContainer> containerList = new ArrayList<>( Arrays.asList(commonSourceLookupDirector.getSourceContainers())); containerList.add(mapContainer); commonSourceLookupDirector diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java index 00da7d80ce8..d7fe5dd96cc 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java @@ -186,7 +186,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase { */ private ISuspendedDMEvent triggerStepIntoSelection(final IExecutionDMContext exeContext, final String sourceName, final int targetLine, final IFunctionDeclaration function, final boolean skipBreakPoints) throws Throwable { - ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(fSession, + ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class); Query<Object> query = new Query<Object>() { @@ -207,7 +207,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase { */ private ISuspendedDMEvent triggerRunToLine(final IExecutionDMContext exeContext, final String sourceName, final int targetLine, final boolean skipBreakPoints) throws Throwable { - ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(fSession, + ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class); Query<Object> query = new Query<Object>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java index 4b17bfbe7ba..f05f698ac84 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java @@ -418,7 +418,7 @@ public class TraceFileTest extends BaseParametrizedTestCase { } private MIBreakpointDMContext setBreakpointAtEndLine() throws Throwable { - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.FUNCTION, END_FUNCTION); @@ -445,7 +445,7 @@ public class TraceFileTest extends BaseParametrizedTestCase { evalAction.setName(String.format("Evaluate %s", TEVAL_STRING)); tam.addAction(evalAction); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, getLineForTag("IF_X_NE_A")); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java index 119923cacec..961cfa508d0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java @@ -353,7 +353,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -463,7 +463,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -577,7 +577,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -696,7 +696,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected a single thread but got " + threads.length, threads.length == 1); - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -767,7 +767,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -777,7 +777,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -819,7 +819,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -829,7 +829,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -862,7 +862,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -876,7 +876,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -910,7 +910,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -927,7 +927,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -1000,7 +1000,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no threads to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -1031,7 +1031,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1069,7 +1069,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1113,7 +1113,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1169,7 +1169,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1444,7 +1444,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1553,7 +1553,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1666,7 +1666,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1996,7 +1996,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2109,7 +2109,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2227,7 +2227,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2345,7 +2345,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2471,7 +2471,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2585,7 +2585,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2703,7 +2703,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2824,7 +2824,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { public void testResumeProcessOneThreadStopped() throws Throwable { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -2894,7 +2894,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2903,7 +2903,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -2936,7 +2936,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2949,7 +2949,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -2983,7 +2983,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2999,7 +2999,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3082,7 +3082,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no process to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3113,7 +3113,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3162,7 +3162,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3217,7 +3217,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3302,7 +3302,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3347,7 +3347,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no contexts to be suspended, but found some", result); - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running processes @@ -3381,7 +3381,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3391,7 +3391,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3427,7 +3427,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3441,7 +3441,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3477,7 +3477,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3491,7 +3491,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3526,7 +3526,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3543,7 +3543,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3650,7 +3650,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no process to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3682,7 +3682,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3733,7 +3733,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3790,7 +3790,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3847,7 +3847,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3937,7 +3937,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3947,7 +3947,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3983,7 +3983,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3997,7 +3997,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -4032,7 +4032,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4049,7 +4049,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -4086,7 +4086,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4137,7 +4137,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4194,7 +4194,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java index 4584f0fb3ed..5b197e94896 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java @@ -68,7 +68,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { private IGDBControl fCommandControl; private IGDBFocusSynchronizer fGdbSync; private DsfSession fSession; - private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<IDMEvent<? extends IDMContext>>(); + private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<>(); // Breakpoint tags in MultiThread.cc public static final String[] LINE_TAGS = new String[] { "LINE_MAIN_BEFORE_THREAD_START", // Just before StartThread @@ -157,7 +157,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testChangingCurrentThreadCLINotification() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -193,7 +193,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testChangingCurrentFrameCLINotification() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -229,7 +229,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testGdbSyncServiceCanSwitchGDBThread() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -270,7 +270,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testGdbSyncServiceCanSwitchGDBStackFrame() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main |