diff options
Diffstat (limited to 'tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf')
10 files changed, 105 insertions, 111 deletions
diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/AbstractTcfUITest.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/AbstractTcfUITest.java index 8bbcfae55..f32988ca3 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/AbstractTcfUITest.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/AbstractTcfUITest.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test; @@ -628,12 +627,12 @@ public abstract class AbstractTcfUITest extends TcfTestCase implements IViewerUp fDebugViewListener.addLabelUpdate(new TreePath(new Object[] { fLaunch, processTCFContext, threadTCFContext })); startProcess(); - + // Make sure that delta is posted after launching process so that it doesn't interfere // with the waiting for the whole viewer to update after breakpoint hit (below). fDebugViewListener.waitTillFinished(MODEL_CHANGED_COMPLETE); fDebugViewListener.resetModelChanged(); - + runToTestEntry(testFunc); removeBreakpoint(bpId); diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/Activator.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/Activator.java index 4a52d85d7..e61e3a1a0 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/Activator.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/Activator.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test; @@ -23,7 +22,7 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - + /** * The constructor */ @@ -34,7 +33,8 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { + @Override + public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } @@ -43,7 +43,8 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { + @Override + public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); } diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/BreakpointsTest.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/BreakpointsTest.java index f2fd1cd0d..105a9db8d 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/BreakpointsTest.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/BreakpointsTest.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test; @@ -31,7 +30,8 @@ import org.eclipse.tcf.services.ILineNumbers.CodeArea; import org.eclipse.tcf.services.ISymbols.Symbol; import org.junit.Assert; -public class BreakpointsTest extends AbstractTcfUITest +@SuppressWarnings("restriction") +public class BreakpointsTest extends AbstractTcfUITest { private BreakpointsListener fBpListener; @@ -39,22 +39,22 @@ public class BreakpointsTest extends AbstractTcfUITest protected void setUp() throws Exception { super.setUp(); fBpListener = new BreakpointsListener(); - - // CDT Breakpoint integration depends on the TCF-CDT breakpoint + + // CDT Breakpoint integration depends on the TCF-CDT breakpoint // integration to be active. This is normally triggered by selecting - // a stack frame in the UI. Here force activation of the plugin + // a stack frame in the UI. Here force activation of the plugin // artificially. None of the cdt integration packages are exported, so - // use the TCF Launch Context extension point indirectly to force the + // use the TCF Launch Context extension point indirectly to force the // plugin to load. TCFLaunchContext.getLaunchContext(null); } - + @Override protected void tearDown() throws Exception { fBpListener.dispose(); super.tearDown(); } - + private CodeArea getFunctionCodeArea(String functionName) throws Exception { return new Transaction<CodeArea>() { @Override @@ -70,42 +70,43 @@ public class BreakpointsTest extends AbstractTcfUITest } }.get(); } - + private ICLineBreakpoint createLineBreakpoint(String file, int line) throws CoreException, ExecutionException, InterruptedException { // Initiate wait for the context changed event. final Object contextChangedWaitKey = new Object(); Protocol.invokeAndWait(new Runnable() { public void run() { - fBreakpointsCM.waitContextAdded(contextChangedWaitKey); + fBreakpointsCM.waitContextAdded(contextChangedWaitKey); }}); - + final ICLineBreakpoint bp = CDIDebugModel.createLineBreakpoint(file, ResourcesPlugin.getWorkspace().getRoot(), ICBreakpointType.REGULAR, line, true, 0, "", true); - + Map<String, Object>[] addedBps = new Transaction<Map<String, Object>[]>() { + @Override protected Map<String, Object>[] process() throws InvalidCacheException ,ExecutionException { return validate(fBreakpointsCM.waitContextAdded(contextChangedWaitKey)); } - + }.get(); fBpListener.setTester(new EventTester() { public boolean checkEvent(EventType type, IBreakpoint testBp, Map<String, Object> deltaAttributes) { - return (type == EventType.CHANGED && bp == testBp); + return (type == EventType.CHANGED && bp == testBp); } }); - + fBpListener.waitForEvent(); - + Assert.assertEquals(1, addedBps.length); - Assert.assertEquals(1, bp.getMarker().getAttribute(ICBreakpoint.INSTALL_COUNT, -1)); - + Assert.assertEquals(1, bp.getMarker().getAttribute(ICBreakpoint.INSTALL_COUNT, -1)); + return bp; } - + public void testContextAddedOnLineBrakpointCreate() throws Exception { initProcessModel("tcf_test_func0"); - + CodeArea bpCodeArea = getFunctionCodeArea("tcf_test_func0"); ICLineBreakpoint bp = createLineBreakpoint(bpCodeArea.file, bpCodeArea.start_line); } - + } diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/SampleTest.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/SampleTest.java index 4cd22e9e1..35334ad9c 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/SampleTest.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/SampleTest.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test; diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/AbstractCacheManager.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/AbstractCacheManager.java index e67670ce3..973097f9f 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/AbstractCacheManager.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/AbstractCacheManager.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; @@ -29,7 +28,7 @@ public class AbstractCacheManager { V cache = (V)fMap.get(key); return cache; } - + protected <V> V mapCache(Key<V> key) { @SuppressWarnings("unchecked") V cache = (V)fMap.get(key); diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/EventKey.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/EventKey.java index d3c8790ab..b0d622e6e 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/EventKey.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/EventKey.java @@ -1,34 +1,33 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; abstract class EventKey<V> extends Key<V> { private Object fClientKey; - + public EventKey(Class<V> eventClazz, Object clientKey) { super(eventClazz); fClientKey = clientKey; } - + @Override public boolean equals(Object obj) { if (super.equals(obj) && obj instanceof EventKey<?>) { return ((EventKey<?>)obj).fClientKey.equals(fClientKey); - } - return false; + } + return false; } - + @Override public int hashCode() { return super.hashCode() + fClientKey.hashCode(); - } + } }
\ No newline at end of file diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdEventKey.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdEventKey.java index a9edf5d08..4184c8837 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdEventKey.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdEventKey.java @@ -1,34 +1,33 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; abstract class IdEventKey<V> extends IdKey<V> { private Object fClientKey; - + public IdEventKey(Class<V> eventClazz, String id, Object clientKey) { super(eventClazz, id); fClientKey = clientKey; } - + @Override public boolean equals(Object obj) { if (super.equals(obj) && obj instanceof IdEventKey<?>) { return ((IdEventKey<?>)obj).fClientKey.equals(fClientKey); - } - return false; + } + return false; } - + @Override public int hashCode() { return super.hashCode() + fClientKey.hashCode(); - } + } }
\ No newline at end of file diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdKey.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdKey.java index 6e62a4c3c..b9a6e3886 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdKey.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/IdKey.java @@ -1,36 +1,35 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; abstract class IdKey<V> extends Key<V> { String fId; - + public IdKey(Class<V> clazz, String id) { super(clazz); fId = id; } - + public String getId() { return fId; } - + @Override public boolean equals(Object obj) { if (super.equals(obj) && obj instanceof IdKey<?>) { return ((IdKey<?>)obj).fId.equals(fId); - } - return false; + } + return false; } - + @Override public int hashCode() { return super.hashCode() + fId.hashCode(); diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/Key.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/Key.java index c12fe7a72..f05118bf4 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/Key.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/Key.java @@ -1,37 +1,36 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; abstract class Key<V> { private Class<V> fCacheClass; - + public Key(Class<V> cacheClass) { fCacheClass = cacheClass; } - + abstract V createCache(); public Class<V> getCacheClass() { return fCacheClass; } - + @Override public boolean equals(Object obj) { if (obj instanceof Key) { return ((Key<?>)obj).fCacheClass.equals(fCacheClass); - } - return false; + } + return false; } - + @Override public int hashCode() { return fCacheClass.hashCode(); diff --git a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/WaitForEventCache.java b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/WaitForEventCache.java index 5028f961d..92ebec519 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/WaitForEventCache.java +++ b/tests/plugins/org.eclipse.tcf.debug.test/src/org/eclipse/tcf/debug/test/services/WaitForEventCache.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Wind River Systems - initial API and implementation *******************************************************************************/ package org.eclipse.tcf.debug.test.services; @@ -17,7 +16,7 @@ class WaitForEventCache<V> extends AbstractCache<V> implements IWaitForEventCach protected void retrieve() { } // no-op - called by listener @Override protected void canceled() { } // no-op - no command sent - + public void eventReceived(V data) { if (!isValid()) { set(data, null, true); // notify listeners |