1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00

@Override annotations and redundant casts.

This commit is contained in:
Sergey Prigogin 2012-01-07 17:32:13 -08:00
parent e7aa4a2154
commit 986bf0206b
583 changed files with 2877 additions and 296 deletions

View file

@ -107,6 +107,7 @@ public class CDescriptorOldTests extends TestCase {
static public class CDescriptorListener implements ICDescriptorListener {
@Override
public void descriptorChanged(CDescriptorEvent event) {
fLastEvent = event;
}
@ -115,6 +116,7 @@ public class CDescriptorOldTests extends TestCase {
static void oneTimeSetUp() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot();
IProject project = root.getProject("testDescriptorProject");
@ -142,6 +144,7 @@ public class CDescriptorOldTests extends TestCase {
public void testDescriptorCreation() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false);
}
@ -205,6 +208,7 @@ public class CDescriptorOldTests extends TestCase {
public void run() {
try {
ICDescriptorOperation operation= new ICDescriptorOperation() {
@Override
public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException {
assertFalse(descriptor.getConfigurationDescription().isReadOnly());
Element data = descriptor.getProjectData("testElement");

View file

@ -114,6 +114,7 @@ public class CDescriptorTests extends BaseTestCase {
static public class CDescriptorListener implements ICDescriptorListener {
@Override
public void descriptorChanged(CDescriptorEvent event) {
fLastEvent = event;
}
@ -122,6 +123,7 @@ public class CDescriptorTests extends BaseTestCase {
static void oneTimeSetUp() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot();
IProject project = root.getProject("testDescriptorProject");
@ -149,6 +151,7 @@ public class CDescriptorTests extends BaseTestCase {
public void testDescriptorCreation() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false);
}
@ -179,6 +182,7 @@ public class CDescriptorTests extends BaseTestCase {
fProject.close(null);
fProject.open(null);
Thread t= new Thread() {
@Override
public void run() {
try {
CCorePlugin.getDefault().getCProjectDescription(fProject, true);
@ -227,6 +231,7 @@ public class CDescriptorTests extends BaseTestCase {
public void run() {
try {
ICDescriptorOperation operation= new ICDescriptorOperation() {
@Override
public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException {
// assertFalse(descriptor.getConfigurationDescription().isReadOnly());
ICStorageElement data = fdesc.getProjectStorageElement("testElement");
@ -268,6 +273,7 @@ public class CDescriptorTests extends BaseTestCase {
public void testConcurrentDifferentStorageElementModification() throws Exception {
for (int i=0; i < 100; ++i) {
Thread t= new Thread() {
@Override
public void run() {
try {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true);
@ -300,6 +306,7 @@ public class CDescriptorTests extends BaseTestCase {
public void testConcurrentSameStorageElementModification() throws Exception {
for (int i=0; i < 100; ++i) {
Thread t= new Thread() {
@Override
public void run() {
try {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true);
@ -332,6 +339,7 @@ public class CDescriptorTests extends BaseTestCase {
oneTimeTearDown();
oneTimeSetUp();
Thread t= new Thread() {
@Override
public void run() {
try {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true);

View file

@ -172,9 +172,11 @@ public class IEnvironmentVariableManagerTests extends TestCase {
project.getFile(".settings/org.eclipse.cdt.core.prefs").setContents(new ByteArrayInputStream(env.getBytes("UTF-8")), true, false, null);
ISchedulingRule incompatibleRule = new ISchedulingRule() {
@Override
public boolean isConflicting(ISchedulingRule rule) {
return rule == this || rule instanceof IResource;
}
@Override
public boolean contains(ISchedulingRule rule) {
return rule == this;
}

View file

@ -54,8 +54,10 @@ public class ErrorParserEfsFileMatchingTest extends TestCase {
private final IMarkerGenerator markerGenerator = new IMarkerGenerator() {
// deprecated
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {}
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
errorList.add(problemMarkerInfo);
}

View file

@ -55,8 +55,10 @@ public class ErrorParserFileMatchingTest extends TestCase {
private final IMarkerGenerator markerGenerator = new IMarkerGenerator() {
// deprecated
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {}
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
errorList.add(problemMarkerInfo);
}

View file

@ -98,10 +98,12 @@ public class ErrorParserManagerTest extends TestCase {
cProject = createProject("errorparsersanity");
markerGenerator = new IMarkerGenerator() {
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
// Obsolete
}
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
errorList.add(problemMarkerInfo);
@ -210,10 +212,12 @@ public class ErrorParserManagerTest extends TestCase {
public static class TestParser1 implements IErrorParser2 {
String last = null;
@Override
public int getProcessLineBehaviour() {
return KEEP_UNTRIMMED;
}
@Override
public boolean processLine(String line, ErrorParserManager eoParser) {
if (line.startsWith(" ") && last!=null) {
eoParser.generateExternalMarker(null, 1, last+line, 1, "", null);
@ -242,10 +246,12 @@ public class ErrorParserManagerTest extends TestCase {
}
public static class TestParser2 implements IErrorParser2 {
@Override
public int getProcessLineBehaviour() {
return KEEP_LONGLINES;
}
@Override
public boolean processLine(String line, ErrorParserManager eoParser) {
if (line.startsWith("errorT: ")) {
eoParser.generateExternalMarker(null, 1, line, 1, "", null);
@ -274,10 +280,12 @@ public class ErrorParserManagerTest extends TestCase {
assertEquals("a la la 99",end);
}
public static class TestParser3 implements IErrorParser2 {
@Override
public int getProcessLineBehaviour() {
return KEEP_LONGLINES | KEEP_UNTRIMMED;
}
@Override
public boolean processLine(String line, ErrorParserManager eoParser) {
if (line.startsWith("errorT: ")) {
eoParser.generateExternalMarker(null, 1, line, 1, "", null);
@ -307,6 +315,7 @@ public class ErrorParserManagerTest extends TestCase {
}
public static class TestParser4 implements IErrorParser {
@Override
public boolean processLine(String line, ErrorParserManager eoParser) {
ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(null, 0, "Workspace level marker", IMarker.SEVERITY_INFO, null);
eoParser.addProblemMarker(problemMarkerInfo);

View file

@ -30,6 +30,7 @@ public class FileBasedErrorParserTests extends GenericErrorParserTests {
errorFile = file;
}
@Override
public String getName() {
return super.getName() + " " + errorFile.getName();
}

View file

@ -57,6 +57,7 @@ public abstract class GenericErrorParserTests extends TestCase {
/*
* @see TestCase#setUp()
*/
@Override
protected void setUp() throws Exception {
super.setUp();
fTempProject = ResourcesPlugin.getWorkspace().getRoot().getProject("temp-" + System.currentTimeMillis());
@ -68,6 +69,7 @@ public abstract class GenericErrorParserTests extends TestCase {
/*
* @see TestCase#tearDown()
*/
@Override
protected void tearDown() {
try {
super.tearDown();
@ -174,6 +176,7 @@ public abstract class GenericErrorParserTests extends TestCase {
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@Override
public int compare(Object arg0, Object arg1) {
try {
IFile f0 = (IFile)arg0;
@ -199,6 +202,7 @@ public abstract class GenericErrorParserTests extends TestCase {
public List<String> descriptions;
private Comparator fFileNameComparator;
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, errorVar, null);
addMarker(problemMarkerInfo);
@ -208,6 +212,7 @@ public abstract class GenericErrorParserTests extends TestCase {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.cdt.core.ProblemMarkerInfo)
*/
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
int index = Collections.binarySearch(uniqFiles, problemMarkerInfo.file, fFileNameComparator);
if (index < 0) {
@ -250,6 +255,7 @@ public abstract class GenericErrorParserTests extends TestCase {
fProject = project;
}
@Override
public IFile findFileName(String fileName) {
if (fileName==null || fileName.trim().length()==0) {
return null;
@ -270,6 +276,7 @@ public abstract class GenericErrorParserTests extends TestCase {
return file;
}
@Override
protected IFile findFileInWorkspace(IPath path) {
IFile file = fProject.getFile(path.lastSegment());
if (!file.exists()) {

View file

@ -49,8 +49,10 @@ public class RegexErrorParserTests extends TestCase {
private final IMarkerGenerator markerGenerator = new IMarkerGenerator() {
// deprecated
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {}
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
errorList.add(problemMarkerInfo);
}
@ -66,6 +68,7 @@ public class RegexErrorParserTests extends TestCase {
public DummyErrorParser() {
}
@Override
public boolean processLine(String line, ErrorParserManager eoParser) {
return false;
}

View file

@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException;
public class AbstractDummyProvider implements IReadOnlyPDOMProvider {
public AbstractDummyProvider() {}
@Override
public IPDOMDescriptor[] getDescriptors(ICConfigurationDescription config) {
if (!DummyProviderTraces.getInstance().enabled)
return new IPDOMDescriptor[0];
@ -30,6 +31,7 @@ public class AbstractDummyProvider implements IReadOnlyPDOMProvider {
return new IPDOMDescriptor[0];
}
@Override
public boolean providesFor(ICProject project) throws CoreException {
if (!DummyProviderTraces.getInstance().enabled)
return true;

View file

@ -31,51 +31,62 @@ public class MemoryFileStore extends FileStore {
this.path = path.setDevice(null);
}
@Override
public String[] childNames(int options, IProgressMonitor monitor) {
final String[] names = TREE.childNames(path);
return names == null ? EMPTY_STRING_ARRAY : names;
}
@Override
public void delete(int options, IProgressMonitor monitor) {
TREE.delete(path);
}
@Override
public IFileInfo fetchInfo(int options, IProgressMonitor monitor) {
return TREE.fetchInfo(path);
}
@Override
public IFileStore getChild(String name) {
return new MemoryFileStore(path.append(name));
}
@Override
public String getName() {
final String name = path.lastSegment();
return name == null ? "" : name;
}
@Override
public IFileStore getParent() {
if (path.segmentCount() == 0)
return null;
return new MemoryFileStore(path.removeLastSegments(1));
}
@Override
public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException {
TREE.mkdir(path, (options & EFS.SHALLOW) == 0);
return this;
}
@Override
public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException {
return TREE.openInputStream(path);
}
@Override
public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException {
return TREE.openOutputStream(path, options);
}
@Override
public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException {
TREE.putInfo(path, info, options);
}
@Override
public URI toURI() {
return MemoryFileSystem.toURI(path);
}

View file

@ -42,10 +42,12 @@ public class MemoryFileSystem extends FileSystem {
super();
}
@Override
public IFileStore getStore(URI uri) {
return new MemoryFileStore(Path.fromPortableString(uri.getSchemeSpecificPart()));
}
@Override
public boolean isCaseSensitive() {
return true;
}

View file

@ -57,11 +57,13 @@ public class MemoryTree {
return null;
}
@Override
protected void initializeInfo(FileInfo fileInfo) {
super.initializeInfo(fileInfo);
fileInfo.setDirectory(true);
}
@Override
boolean isFile() {
return false;
}
@ -72,6 +74,7 @@ public class MemoryTree {
children.remove(child);
}
@Override
public String toString() {
return super.toString() + ' ' + children;
}
@ -84,6 +87,7 @@ public class MemoryTree {
super(parent, name);
}
@Override
boolean isFile() {
return true;
}
@ -94,6 +98,7 @@ public class MemoryTree {
public OutputStream openOutputStream(final int options) {
return new ByteArrayOutputStream() {
@Override
public void close() throws IOException {
super.close();
setContents(toByteArray(), options);
@ -151,6 +156,7 @@ public class MemoryTree {
/**
* For debugging purposes only.
*/
@Override
public String toString() {
return info.getName();
}

View file

@ -63,6 +63,7 @@ public class RefreshScopeTests extends TestCase {
// create project
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
ICProject cProject = CProjectHelper.createNewStileCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false);
fProject = cProject.getProject();
@ -99,6 +100,7 @@ public class RefreshScopeTests extends TestCase {
fFolder6 = folder6;
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
folder1.create(true, true, monitor);

View file

@ -27,6 +27,7 @@ public class CdtVariableResolverTest extends TestCase {
private class MockSubstitutor implements IVariableSubstitutor {
@Override
public String resolveToString(String macroName)
throws CdtVariableException {
if (macroName.equals("null")) {
@ -44,6 +45,7 @@ public class CdtVariableResolverTest extends TestCase {
return "#"+macroName+"#";
}
@Override
public String[] resolveToStringList(String macroName)
throws CdtVariableException {

View file

@ -52,6 +52,7 @@ public class LanguageInheritanceTests extends BaseTestCase {
return suite(LanguageInheritanceTests.class);
}
@Override
protected void setUp() throws Exception {
String name = getClass().getName() + "_" + getName();
fCProject = CProjectHelper.createCCProject(name , BIN_FOLDER, IPDOMManager.ID_NO_INDEXER);
@ -71,6 +72,7 @@ public class LanguageInheritanceTests extends BaseTestCase {
fManager.storeWorkspaceLanguageConfiguration(EMPTY_CONTENT_TYPES);
}
@Override
protected void tearDown() throws Exception {
CProjectHelper.delete(fCProject);
}

View file

@ -56,6 +56,7 @@ public class ASTCacheTests extends BaseTestCase {
fCache= cache;
setDaemon(true);
}
@Override
public void run() {
while (!fStopped) {
try {
@ -98,6 +99,7 @@ public class ASTCacheTests extends BaseTestCase {
private final String SOURCE1= "void foo1() {}"; //$NON-NLS-1$
private final String SOURCE2= "void foo2() {}"; //$NON-NLS-1$
@Override
public void setUp() throws Exception {
super.setUp();
IProgressMonitor npm= new NullProgressMonitor();
@ -116,6 +118,7 @@ public class ASTCacheTests extends BaseTestCase {
fIndex.acquireReadLock();
}
@Override
public void tearDown() throws Exception {
if (fIndex != null) {
fIndex.releaseReadLock();
@ -158,6 +161,7 @@ public class ASTCacheTests extends BaseTestCase {
final int[] counter= {0};
cache.setActiveElement(fTU1);
IStatus status= cache.runOnAST(fTU1, false, null, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
assertNull(ast);
counter[0]++;
@ -169,6 +173,7 @@ public class ASTCacheTests extends BaseTestCase {
IProgressMonitor npm= new NullProgressMonitor();
npm.setCanceled(true);
status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
assertNull(ast);
counter[0]++;
@ -179,6 +184,7 @@ public class ASTCacheTests extends BaseTestCase {
npm.setCanceled(false);
status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
assertNotNull(ast);
counter[0]++;
@ -204,6 +210,7 @@ public class ASTCacheTests extends BaseTestCase {
}
reconciler1.fStopped= true;
IStatus status= cache.runOnAST(fTU1, true, null, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
assertNotNull(ast);
assertTrue(cache.isActiveElement(fTU1));
@ -226,6 +233,7 @@ public class ASTCacheTests extends BaseTestCase {
reconciler2.fStopped= true;
status= cache.runOnAST(fTU2, true, null, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
assertNotNull(ast);
assertTrue(cache.isActiveElement(fTU2));
@ -257,6 +265,7 @@ public class ASTCacheTests extends BaseTestCase {
cache.setActiveElement(fTU1);
Thread.sleep(50);
waitForAST(cache, fTU1, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
assertNotNull(ast);
assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature());
@ -265,6 +274,7 @@ public class ASTCacheTests extends BaseTestCase {
});
waitForAST(cache, fTU2, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
assertNotNull(ast);
assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature());
@ -276,6 +286,7 @@ public class ASTCacheTests extends BaseTestCase {
cache.setActiveElement(fTU2);
Thread.sleep(50);
waitForAST(cache, fTU2, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
assertNotNull(ast);
assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature());
@ -284,6 +295,7 @@ public class ASTCacheTests extends BaseTestCase {
});
waitForAST(cache, fTU1, new ASTRunnable() {
@Override
public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
assertNotNull(ast);
assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature());

View file

@ -78,7 +78,8 @@ public class ArchiveTests extends TestCase {
* Example code test the packages in the project
* "com.qnx.tools.ide.cdt.core"
*/
protected void setUp() throws Exception {
@Override
protected void setUp() throws Exception {
/***
* Setup the various files, paths and projects that are needed by the
@ -134,7 +135,8 @@ public class ArchiveTests extends TestCase {
*
* Called after every test case method.
*/
protected void tearDown() {
@Override
protected void tearDown() {
CProjectHelper.delete(testProject);
}

View file

@ -78,6 +78,7 @@ public class Bug311189 extends BaseTestCase {
// Path entry update should now be running...
// Tick a workspace job through the workspace so we get when it's finished
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
}
}, null);

View file

@ -46,7 +46,8 @@ public class CModelExceptionTest extends TestCase {
* Example code test the packages in the project
* "com.qnx.tools.ide.cdt.core"
*/
protected void setUp() {
@Override
protected void setUp() {
// create shared resources and setup the test fixture
cModelStatus = new CModelStatus();
coreException = new CoreException(cModelStatus);
@ -57,7 +58,8 @@ public class CModelExceptionTest extends TestCase {
*
* Called after every test case method.
*/
protected void tearDown() {
@Override
protected void tearDown() {
// release resources here and clean-up
}

View file

@ -50,6 +50,7 @@ public class CModelIdentifierTests extends BaseTestCase {
private ICProject fCProject;
private IFile fHeaderFile;
@Override
protected void setUp() throws Exception {
// reusing project setup from CModelElementsTests
NullProgressMonitor monitor= new NullProgressMonitor();
@ -69,6 +70,7 @@ public class CModelIdentifierTests extends BaseTestCase {
CCorePlugin.getIndexManager().joinIndexer(10000, new NullProgressMonitor());
}
@Override
protected void tearDown() {
CProjectHelper.delete(fCProject);
}
@ -91,6 +93,7 @@ public class CModelIdentifierTests extends BaseTestCase {
final List elements= new ArrayList();
final List identifiers= new ArrayList();
ICElementVisitor visitor= new ICElementVisitor() {
@Override
public boolean visit(ICElement element) throws CoreException {
elements.add(element);
identifiers.add(element.getHandleIdentifier());

View file

@ -502,7 +502,8 @@ public class CModelTests extends TestCase {
final boolean binContainerChanged[] = { false };
IElementChangedListener elementChangedListener = new IElementChangedListener() {
public void elementChanged(ElementChangedEvent event) {
@Override
public void elementChanged(ElementChangedEvent event) {
ICElementDelta delta = event.getDelta();
processDelta(delta);
}
@ -560,7 +561,8 @@ public class CModelTests extends TestCase {
String baseDir= FileLocator.toFileURL(FileLocator.find(bundle, new Path(sources), null)).getFile();
ImportOperation importOp = new ImportOperation(project.getProject().getFullPath(),
new File(baseDir), FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() {
public String queryOverwrite(String file) {
@Override
public String queryOverwrite(String file) {
return ALL;
}});
importOp.setCreateContainerStructure(true);

View file

@ -80,6 +80,7 @@ public class CPathEntryTest extends BaseTestCase {
*
* @see org.eclipse.cdt.core.model.IElementChangedListener#elementChanged(org.eclipse.cdt.core.model.ElementChangedEvent)
*/
@Override
public void elementChanged(ElementChangedEvent event) {
processDelta(event.getDelta());
}
@ -101,6 +102,7 @@ public class CPathEntryTest extends BaseTestCase {
* Called before every test case method.
*
*/
@Override
protected void setUp() throws CoreException {
/***************************************************************************************************************************
* The test of the tests assume that they have a working workspace and workspace root object to use to create
@ -126,6 +128,7 @@ public class CPathEntryTest extends BaseTestCase {
*
* Called after every test case method.
*/
@Override
protected void tearDown() {
// release resources here and clean-up
}
@ -205,6 +208,7 @@ public class CPathEntryTest extends BaseTestCase {
IContainerEntry containerEntry = CoreModel.newContainerEntry(containerID);
IPathEntryContainer container = new IPathEntryContainer() {
@Override
public IPathEntry[] getPathEntries() {
IPathEntry[] entries = new IPathEntry[3];
entries[0] = CoreModel.newIncludeEntry(new Path(""), null, new Path("/usr/include"), true);
@ -213,10 +217,12 @@ public class CPathEntryTest extends BaseTestCase {
return entries;
}
@Override
public String getDescription() {
return "Testing container"; //$NON-NLS-1$
}
@Override
public IPath getPath() {
return containerID;
}

View file

@ -66,6 +66,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
super(name);
}
@Override
protected void setUp() throws Exception {
monitor = new NullProgressMonitor();
@ -91,6 +92,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
changedElements = new Vector(20);
}
@Override
protected void tearDown() {
CProjectHelper.delete(fCProject);
}
@ -237,6 +239,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
return found;
}
@Override
public void elementChanged(ElementChangedEvent event){
try {
addedElements.clear();

View file

@ -41,7 +41,8 @@ public class FlagTests extends TestCase {
* Example code test the packages in the project
* "com.qnx.tools.ide.cdt.core"
*/
protected void setUp() {
@Override
protected void setUp() {
flags=new int[15];
flags[0]=IConstants.AccPublic;
flags[1]=IConstants.AccPrivate;
@ -66,7 +67,8 @@ public class FlagTests extends TestCase {
*
* Called after every test case method.
*/
protected void tearDown() {
@Override
protected void tearDown() {
// release resources here and clean-up
}

View file

@ -40,6 +40,7 @@ public class IIncludeTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileSubdir() {
return "resources/cmodel/";
}
@ -47,6 +48,7 @@ public class IIncludeTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileResource() {
return "IIncludeTest.h";
}

View file

@ -54,6 +54,7 @@ public class IMacroTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileSubdir() {
return "resources/cmodel/";
}
@ -61,6 +62,7 @@ public class IMacroTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileResource() {
return "IMacroTest.h";
}

View file

@ -46,6 +46,7 @@ public class ITemplateTests extends IntegratedCModelTest {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileSubdir()
*/
@Override
public String getSourcefileSubdir() {
return "resources/cmodel/";
}
@ -53,6 +54,7 @@ public class ITemplateTests extends IntegratedCModelTest {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileResource()
*/
@Override
public String getSourcefileResource() {
return "ITemplate.cpp";
}

View file

@ -68,6 +68,7 @@ public abstract class IntegratedCModelTest extends TestCase {
*/
abstract public String getSourcefileResource();
@Override
public void setUp() throws Exception {
monitor = new NullProgressMonitor();
fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER);
@ -86,6 +87,7 @@ public abstract class IntegratedCModelTest extends TestCase {
CCorePlugin.getIndexManager().joinIndexer(2000, new NullProgressMonitor());
}
@Override
protected void tearDown() {
CProjectHelper.delete(fCProject);
}

View file

@ -41,6 +41,7 @@ public class MacroTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileSubdir() {
return "resources/cmodel/";
}
@ -48,6 +49,7 @@ public class MacroTests extends IntegratedCModelTest {
/**
* @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
*/
@Override
public String getSourcefileResource() {
return "MacroTests.cpp";
}

View file

@ -69,6 +69,7 @@ public class StructuralCModelElementsTests extends TestCase {
super(name);
}
@Override
protected void setUp() throws Exception {
monitor = new NullProgressMonitor();
fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$
@ -92,6 +93,7 @@ public class StructuralCModelElementsTests extends TestCase {
}
@Override
protected void tearDown() {
CProjectHelper.delete(fCProject);
}

View file

@ -39,6 +39,7 @@ public class StructuralMacroTests extends IMacroTests {
}
@Override
public void testGetElementName() throws CModelException {
setStructuralParse(true);
super.testGetElementName();

View file

@ -54,6 +54,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testAnonymousStructObject()
*/
@Override
public void testAnonymousStructObject() throws CModelException {
setStructuralParse(true);
super.testAnonymousStructObject();
@ -61,6 +62,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetAccessControl()
*/
@Override
public void testGetAccessControl() throws CModelException {
setStructuralParse(true);
super.testGetAccessControl();
@ -68,6 +70,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetBaseTypes()
*/
@Override
public void testGetBaseTypes() throws CModelException {
setStructuralParse(true);
super.testGetBaseTypes();
@ -75,6 +78,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeClass()
*/
@Override
public void testGetChildrenOfTypeClass() throws CModelException {
setStructuralParse(true);
super.testGetChildrenOfTypeClass();
@ -82,6 +86,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeStruct()
*/
@Override
public void testGetChildrenOfTypeStruct() throws CModelException {
setStructuralParse(true);
super.testGetChildrenOfTypeStruct();
@ -89,6 +94,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetField()
*/
@Override
public void testGetField() throws CModelException {
setStructuralParse(true);
super.testGetField();
@ -96,6 +102,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFields()
*/
@Override
public void testGetFields() throws CModelException {
setStructuralParse(true);
super.testGetFields();
@ -103,6 +110,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFieldsHack()
*/
@Override
public void testGetFieldsHack() throws CModelException {
setStructuralParse(true);
super.testGetFieldsHack();
@ -110,6 +118,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethod()
*/
@Override
public void testGetMethod() throws CModelException {
setStructuralParse(true);
super.testGetMethod();
@ -117,6 +126,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethods()
*/
@Override
public void testGetMethods() throws CModelException {
setStructuralParse(true);
super.testGetMethods();
@ -124,6 +134,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethodsHack()
*/
@Override
public void testGetMethodsHack() throws CModelException {
setStructuralParse(true);
super.testGetMethodsHack();
@ -131,6 +142,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetStructureInfo()
*/
@Override
public void testGetStructureInfo() {
setStructuralParse(true);
super.testGetStructureInfo();
@ -138,6 +150,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testInnerStruct()
*/
@Override
public void testInnerStruct() throws CModelException {
setStructuralParse(true);
super.testInnerStruct();
@ -145,6 +158,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsAbstract()
*/
@Override
public void testIsAbstract() throws CModelException {
setStructuralParse(true);
super.testIsAbstract();
@ -152,6 +166,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsClass()
*/
@Override
public void testIsClass() throws CModelException {
setStructuralParse(true);
super.testIsClass();
@ -159,6 +174,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsStruct()
*/
@Override
public void testIsStruct() throws CModelException {
setStructuralParse(true);
super.testIsStruct();
@ -166,6 +182,7 @@ public class StructuralStructureTests extends IStructureTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsUnion()
*/
@Override
public void testIsUnion() throws CModelException {
setStructuralParse(true);
super.testIsUnion();

View file

@ -47,6 +47,7 @@ public class StructuralTemplateTests extends ITemplateTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetChildrenOfTypeTemplate()
*/
@Override
public void testGetChildrenOfTypeTemplate() throws CModelException {
setStructuralParse(true);
ITranslationUnit tu = getTU();
@ -116,6 +117,7 @@ public class StructuralTemplateTests extends ITemplateTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetNumberOfTemplateParameters()
*/
@Override
public void testGetNumberOfTemplateParameters() throws CModelException {
setStructuralParse(true);
ITranslationUnit tu = getTU();
@ -145,6 +147,7 @@ public class StructuralTemplateTests extends ITemplateTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateParameterTypes()
*/
@Override
public void testGetTemplateParameterTypes() throws CModelException {
setStructuralParse(true);
ITranslationUnit tu = getTU();
@ -195,6 +198,7 @@ public class StructuralTemplateTests extends ITemplateTests {
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateSignature()
*/
@Override
public void testGetTemplateSignature() throws CModelException {
setStructuralParse(true);
ITranslationUnit tu = getTU();

View file

@ -71,7 +71,8 @@ public class TranslationUnitBaseTest extends TestCase
* Example code test the packages in the project
* "com.qnx.tools.ide.cdt.core"
*/
protected void setUp() throws Exception
@Override
protected void setUp() throws Exception
{
/***
* The rest of the tests assume that they have a working workspace
@ -145,7 +146,8 @@ public class TranslationUnitBaseTest extends TestCase
*
* Called after every test case method.
*/
protected void tearDown()
@Override
protected void tearDown()
{
// release resources here and clean-up
try {

View file

@ -56,6 +56,7 @@ public class WorkingCopyTests extends TestCase {
super(name);
}
@Override
protected void setUp() throws Exception {
monitor = new NullProgressMonitor();
@ -75,6 +76,7 @@ public class WorkingCopyTests extends TestCase {
}
}
@Override
protected void tearDown() {
CProjectHelper.delete(fCProject);
}

View file

@ -433,6 +433,7 @@ public class CConfigurationDescriptionExportSettings extends BaseTestCase {
// Now replace the .cproject with .cproject_back. The exported settings should be picked up in the referenced config
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
libCproject.setContents(libCproject_back.getContents(), IResource.NONE, null);
mainCproject.setContents(mainCproject_back.getContents(), IResource.NONE, null);

View file

@ -41,6 +41,7 @@ public class CProjectDescriptionDeltaTests extends BaseTestCase{
fDelta = null;
}
@Override
public void handleEvent(CProjectDescriptionEvent event) {
if(!event.getProject().getName().equals(fProjName))
return;
@ -66,9 +67,11 @@ public class CProjectDescriptionDeltaTests extends BaseTestCase{
return suite(CProjectDescriptionDeltaTests.class, "_");
}
@Override
protected void setUp() throws Exception {
}
@Override
protected void tearDown() throws Exception {
ResourceHelper.cleanUp();
}

View file

@ -351,6 +351,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
csettings.create(true, false, null);
csettings_back.accept(new IResourceVisitor() {
@Override
public boolean visit(IResource resource) throws CoreException {
assertTrue(resource instanceof IFile);
csettings.getFile(resource.getName()).create(((IFile)resource).getContents(), false, null);
@ -448,6 +449,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
private static class OurResourceChangeListener implements IResourceChangeListener {
boolean changeDetected;
private Set<IPath> filesToWatch = new HashSet<IPath>();
@Override
public synchronized void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
if (delta == null)

View file

@ -28,6 +28,7 @@ public class CfgSettingsTests extends BaseTestCase {
return suite(CfgSettingsTests.class, "_");
}
@Override
protected void setUp() throws Exception {
}
@ -147,6 +148,7 @@ public class CfgSettingsTests extends BaseTestCase {
return ICProjectDescriptionPreferences.CONFIGS_INDEPENDENT;
}
@Override
protected void tearDown() throws Exception {
try {
if(p1 != null){

View file

@ -35,6 +35,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{
return suite(ExternalSettingsProviderTests.class, "_");
}
@Override
protected void setUp() throws Exception {
p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
p2 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER);
@ -425,6 +426,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{
assertTrue(Arrays.equals(expectedEntriesSet, entries));
}
@Override
protected void tearDown() throws Exception {
try {
p1.getProject().delete(true, null);

View file

@ -26,9 +26,11 @@ public class PathSettingsContainerTests extends BaseTestCase {
return suite(PathSettingsContainerTests.class, "_");
}
@Override
protected void setUp() throws Exception {
}
@Override
protected void tearDown() throws Exception {
}

View file

@ -42,6 +42,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
fProjName = projName;
}
@Override
public void handleEvent(CProjectDescriptionEvent event) {
if(!event.getProject().getName().equals(fProjName))
return;
@ -89,6 +90,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
return suite(ProjectCreationStateTests.class, "_");
}
@Override
protected void setUp() throws Exception {
// p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
}
@ -362,6 +364,7 @@ public class ProjectCreationStateTests extends BaseTestCase{
}
@Override
protected void tearDown() throws Exception {
if(listener != null){
CoreModel.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(listener);

View file

@ -33,6 +33,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider {
// Overriden so it supports saving Library file and Library path entries
private static final class TestDataFactory extends CDataFactory {
@Override
public CLanguageData createLanguageData(CConfigurationData cfg,
CResourceData rcBase,
CLanguageData base,
@ -43,6 +44,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider {
return new CDefaultLanguageData(id, base);
}
@Override
public CLanguageData createLanguageData(CConfigurationData cfg,
CResourceData rcBase,
String id,

View file

@ -94,6 +94,7 @@ public class TestExtSettingsProvider extends CExternalSettingProvider {
private static int variantNum;
@Override
public CExternalSetting[] getSettings(IProject project,
ICConfigurationDescription cfg) {
return SETTINGS_VARIANTS[variantNum].clone();

View file

@ -34,6 +34,7 @@ public class TestUserAndDiscoveredEntriesCfgDataProvider extends UserAndDiscover
ENTRIES_STORES[0].put(ICSettingEntry.MACRO, entries);
}
@Override
protected ICLanguageSettingEntry[] getAllDiscoveredEntries(
LanguageData data, int kind) {
ICLanguageSettingEntry entries[] = (ICLanguageSettingEntry[])ENTRIES_STORES[0].get(kind);

View file

@ -99,6 +99,7 @@ public abstract class AutomatedFramework extends TestCase {
fail( "Unable to load properties file." ); //$NON-NLS-1$
}
@Override
protected void runTest() throws Throwable {
String name = getName();
@ -165,6 +166,7 @@ public abstract class AutomatedFramework extends TestCase {
static private class Filter implements FilenameFilter
{
@Override
public boolean accept(File dir, String name) {
if( name.endsWith(".cpp") || //$NON-NLS-1$
name.endsWith(".c") || //$NON-NLS-1$

View file

@ -98,7 +98,8 @@ public class FileBasePluginTest extends TestCase {
}
}
protected void tearDown() throws Exception {
@Override
protected void tearDown() throws Exception {
if( project == null || !project.exists() )
return;

View file

@ -28,7 +28,8 @@ public class ObjectMapTest extends TestCase {
HashObject( int h ){
hash = h;
}
public int hashCode(){
@Override
public int hashCode(){
return hash;
}
final public int hash;

View file

@ -1204,7 +1204,7 @@ public class AST2CSpecTest extends AST2SpecBaseTest {
buffer.append("// a is a pointer to a VLA with n*m+300 elements\n"); //$NON-NLS-1$
buffer.append("a[i][j] += x;\n"); //$NON-NLS-1$
buffer.append("}\n");
String code = buffer.toString(); //$NON-NLS-1$
String code = buffer.toString();
// no valid c++ code
parse(code, ParserLanguage.C, true, 0);
}

View file

@ -102,7 +102,8 @@ public class AST2FileBasePluginTest extends TestCase {
}
}
protected void tearDown() throws Exception {
@Override
protected void tearDown() throws Exception {
if( project == null || !project.exists() )
return;

View file

@ -69,7 +69,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testSimpleKRCTest1() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(char x);\n" ); //$NON-NLS-1$
buffer.append( "int f(x) char x;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
@ -104,7 +104,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testSimpleKRCTest2() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f();\n" ); //$NON-NLS-1$
buffer.append( "int f(x) char x;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
@ -135,7 +135,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testSimpleKRCTest3() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int const *f();\n" ); //$NON-NLS-1$
buffer.append( "int const *f(x) char x;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
@ -158,7 +158,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRC_1() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int isroot (x, y) /* comment */ \n" ); //$NON-NLS-1$
buffer.append( "int x;\n" ); //$NON-NLS-1$
buffer.append( "int y;\n" ); //$NON-NLS-1$
@ -204,7 +204,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCWithTypes() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "typedef char c;\n" ); //$NON-NLS-1$
buffer.append( "int isroot (c);\n" ); //$NON-NLS-1$
buffer.append( "int isroot (x) \n" ); //$NON-NLS-1$
@ -258,7 +258,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCProblem1() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(x) char\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false );
@ -268,7 +268,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCProblem2() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int i=0;\n" ); //$NON-NLS-1$
buffer.append( "int f(x) i++;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
@ -279,7 +279,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCProblem3() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(x) char y;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false );
@ -304,7 +304,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCProblem4() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(x,y,z) char x,y,z; int a;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false );
@ -354,7 +354,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRCProblem5() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(x) char x,a;\n" ); //$NON-NLS-1$
buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false );
@ -380,7 +380,7 @@ public class AST2KnRTests extends AST2BaseTest {
public void testKRC_monop_cards1() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "#ifdef __STDC__\n" ); //$NON-NLS-1$
buffer.append( "#define __P(x) x\n" ); //$NON-NLS-1$
buffer.append( "#else\n" ); //$NON-NLS-1$
@ -505,7 +505,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRC_monop_cards2() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int\n" ); //$NON-NLS-1$
buffer.append( "getinp(prompt, list)\n" ); //$NON-NLS-1$
buffer.append( " const char *prompt, *const list[];\n" ); //$NON-NLS-1$
@ -547,7 +547,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRC_getParametersOrder() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "int f(a, b) int b,a;{}\n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true );
@ -562,7 +562,7 @@ public class AST2KnRTests extends AST2BaseTest {
}
public void testKRC_Ethereal_1() throws Exception {
StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append( "struct symbol {\n" ); //$NON-NLS-1$
buffer.append( "int lambda;\n};\n" ); //$NON-NLS-1$
buffer.append( "struct lemon {\n" ); //$NON-NLS-1$

View file

@ -36,6 +36,7 @@ public class CharArrayMapTest extends TestCase {
this.length = length;
this.start = start;
}
@Override
public String toString() {
return new String(chars, start, length);
}

View file

@ -57,6 +57,7 @@ public class CodeReaderCacheTest extends CDOMBaseTest {
this.code = code;
}
@Override
protected IStatus run(IProgressMonitor monitor) {
while(!monitor.isCanceled()) {
try {

View file

@ -99,7 +99,8 @@ public class DOMFileBasePluginTest extends TestCase {
}
}
protected void tearDown() throws Exception {
@Override
protected void tearDown() throws Exception {
if( project == null || !project.exists() )
return;

View file

@ -142,11 +142,13 @@ public class DOMLocationInclusionTests extends AST2FileBasePluginTest {
}
public IScannerInfo getScannerInfo() {
@Override
public IScannerInfo getScannerInfo() {
return info;
}
public String getParserDialect() {
@Override
public String getParserDialect() {
return dialect;
}

View file

@ -207,10 +207,10 @@ public class DOMSearchUtil {
names = tu.getDefinitionsInAST(binding);
} else if (limitTo == ALL_OCCURRENCES){
names = tu.getDeclarationsInAST(binding);
names = (IASTName[])ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
} else { // assume ALL
names = tu.getDeclarationsInAST(binding);
names = (IASTName[])ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
}
return names;

View file

@ -116,6 +116,7 @@ public class ImageLocationTests extends AST2BaseTest {
{
shouldVisitNames= true;
}
@Override
public int visit(IASTName name) {
result[0]= name;
return PROCESS_ABORT;

View file

@ -24,10 +24,12 @@ public class TestLexerLog implements ILexerLog {
fInput= input;
}
@Override
public void handleComment(boolean isBlockComment, int offset, int endOffset) {
fComments.add(fInput.substring(offset, endOffset));
}
@Override
public void handleProblem(int problemID, char[] arg, int offset, int endOffset) {
fProblems.add(createString(problemID, new String(arg)));
}

View file

@ -114,6 +114,7 @@ public class CompletionTestBase extends BaseTestCase {
}
private static class BindingsComparator implements Comparator {
@Override
public int compare(Object o1, Object o2) {
IBinding b1 = (IBinding)o1;
IBinding b2 = (IBinding)o2;

View file

@ -93,6 +93,7 @@ public abstract class RewriteBaseTest extends BaseTestFramework implements ILogL
super.tearDown();
}
@Override
public void logging(IStatus status, String plugin) {
Throwable ex = status.getException();
StringBuilder stackTrace = new StringBuilder();

View file

@ -51,7 +51,7 @@ public class ExpressionTest extends ChangeGeneratorTest {
expressionList.getExpressions();
CPPASTIdExpression idExpression = new CPPASTIdExpression(new CPPASTName("c".toCharArray()));
CPPASTBinaryExpression binEx = new CPPASTBinaryExpression(IASTBinaryExpression.op_assign,
idExpression, new CPPASTLiteralExpression(0, "9".toCharArray())); //$NON-NLS-1$ //$NON-NLS-2$
idExpression, new CPPASTLiteralExpression(0, "9".toCharArray())); //$NON-NLS-1$
ASTModification modification = new ASTModification(ASTModification.ModificationKind.APPEND_CHILD,
expressionList, binEx, null);
modStore.storeModification(null, modification);

View file

@ -182,6 +182,7 @@ public class CommentHandlingTest extends RewriteBaseTest {
}
private final class NodeOffsetComparator implements Comparator<IASTNode> {
@Override
public int compare(IASTNode o1, IASTNode o2) {
int offDif = o1.getFileLocation().getNodeOffset() - o2.getFileLocation().getNodeOffset();
if (offDif == 0) {

View file

@ -24,7 +24,7 @@ public class CommentHandlingTestSuite extends TestSuite {
public static Test suite() throws Exception {
TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName());
suite.addTest(RewriteTester.suite("CommentTests",
"resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$ //$NON-NLS-2$
"resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$
suite.addTestSuite(NodeCommentMapTest.class);
return suite;
}

View file

@ -128,23 +128,28 @@ public class NodeCommentMapTest extends TestCase {
private class Comment extends ASTNode implements IASTComment {
private char[] comment;
@Override
public char[] getComment() {
return comment;
}
@Override
public void setComment(char[] comment) {
this.comment = comment;
}
// not used
@Override
public boolean isBlockComment() {
return false;
}
@Override
public IASTNode copy() {
return null;
}
@Override
public IASTNode copy(CopyStyle style) {
return null;
}

View file

@ -62,24 +62,31 @@ public class LocationMapTests extends BaseTestCase {
fOffset= offset;
fEndOffset= endOffset;
}
@Override
public int getEndingLineNumber() {
return 0;
}
@Override
public String getFileName() {
return fFile;
}
@Override
public int getNodeLength() {
return fEndOffset-fOffset;
}
@Override
public int getNodeOffset() {
return fOffset;
}
@Override
public int getStartingLineNumber() {
return 0;
}
@Override
public IASTFileLocation asFileLocation() {
return this;
}
@Override
public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
return null;
}

View file

@ -130,6 +130,7 @@ public class PortedScannerTests extends PreprocessorTestsBase {
System.arraycopy(v, 0, values, 0, length);
}
@Override
public String toString() {
StringBuffer s = new StringBuffer();
for (int i = 0; i < length; ++i) {

View file

@ -27,34 +27,42 @@ final class TestMacro implements IMacroBinding {
fParams= params;
}
@Override
public char[] getExpansion() {
return fExpansion.toCharArray();
}
@Override
public boolean isFunctionStyle() {
return fParams != null;
}
@Override
public ILinkage getLinkage() {
return null;
}
@Override
public String getName() {
return fName;
}
@Override
public char[] getNameCharArray() {
return fName.toCharArray();
}
@Override
public IScope getScope() throws DOMException {
return null;
}
@Override
public Object getAdapter(Class adapter) {
return null;
}
@Override
public char[][] getParameterList() {
if (fParams == null) {
return null;
@ -66,18 +74,22 @@ final class TestMacro implements IMacroBinding {
return result;
}
@Override
public char[] getExpansionImage() {
return getExpansion();
}
@Override
public char[][] getParameterPlaceholderList() {
return getParameterList();
}
@Override
public boolean isDynamic() {
return false;
}
@Override
public IBinding getOwner() {
return null;
}

View file

@ -37,98 +37,119 @@ import org.eclipse.core.runtime.IProgressMonitor;
* @since 4.0.1
*/
public class EmptyIndexFragment implements IIndexFragment {
@Override
public void acquireReadLock() throws InterruptedException {}
@Override
public IIndexFragmentBinding adaptBinding(IBinding binding) {
return null;
}
@Override
public IIndexFragmentBinding findBinding(IASTName astName) {
return null;
}
@Override
public IIndexFragmentBinding[] findBindings(Pattern[] patterns,
boolean isFullyQualified, IndexFilter filter,
IProgressMonitor monitor) throws CoreException {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public IIndexFragmentBinding[] findBindings(char[][] names,
IndexFilter filter, IProgressMonitor monitor) throws CoreException {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public IIndexFragmentBinding[] findBindings(char[] name,
boolean filescope, IndexFilter filter, IProgressMonitor monitor)
throws CoreException {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public IIndexFragmentBinding[] findBindingsForPrefix(char[] prefix,
boolean filescope, IndexFilter filter, IProgressMonitor monitor)
throws CoreException {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public IIndexFragmentBinding[] findBindingsForContentAssist(char[] prefix,
boolean filescope, IndexFilter filter, IProgressMonitor monitor)
throws CoreException {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public IIndexMacro[] findMacros(char[] name, boolean isPrefix, boolean caseSensitive, IndexFilter filter, IProgressMonitor monitor) {
return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY;
}
@Override
public IIndexFragmentInclude[] findIncludedBy(IIndexFragmentFile file)
throws CoreException {
return IIndexFragmentInclude.EMPTY_FRAGMENT_INCLUDES_ARRAY;
}
@Override
public IIndexFragmentName[] findNames(IBinding binding, int flags) {
return IIndexFragmentName.EMPTY_NAME_ARRAY;
}
@Override
public IIndexFragmentBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor) {
return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
}
@Override
public long getCacheHits() {
return 0;
}
@Override
public long getCacheMisses() {
return 0;
}
@Override
@Deprecated
public IIndexFragmentFile getFile(int linkageID, IIndexFileLocation location)
throws CoreException {
return null;
}
@Override
public IIndexFragmentFile getFile(int linkageID, IIndexFileLocation location,
ISignificantMacros sigMacros) throws CoreException {
return null;
}
@Override
public IIndexFragmentFile[] getFiles(int linkageID, IIndexFileLocation location)
throws CoreException {
return IIndexFragmentFile.EMPTY_ARRAY;
}
@Override
public IIndexFragmentFile[] getFiles(IIndexFileLocation location) throws CoreException {
return IIndexFragmentFile.EMPTY_ARRAY;
}
@Override
public long getLastWriteAccess() {
return 0;
}
@Override
public IIndexLinkage[] getLinkages() {
return IIndexLinkage.EMPTY_INDEX_LINKAGE_ARRAY;
}
@Override
public String getProperty(String key) throws CoreException {
if(IIndexFragment.PROPERTY_FRAGMENT_ID.equals(key)) {
return "org.eclipse.cdt.internal.core.index.EmptyIndexFragment"; //$NON-NLS-1$
@ -142,32 +163,41 @@ public class EmptyIndexFragment implements IIndexFragment {
return null;
}
@Override
public void releaseReadLock() {}
@Override
public boolean hasWaitingReaders() {
return false;
}
@Override
public void resetCacheCounters() {}
@Override
public IIndexFragmentFileSet createFileSet() {
return null;
}
@Override
public IIndexFragmentFile[] getAllFiles() {
return IIndexFragmentFile.EMPTY_ARRAY;
}
@Override
public Object getCachedResult(Object key) {
return null;
}
@Override
public Object putCachedResult(Object key, Object value, boolean replace) {
return value;
}
@Override
public void clearResultCache() {
}
@Override
public IIndexScope[] getInlineNamespaces() {
return IIndexScope.EMPTY_INDEX_SCOPE_ARRAY;
}

View file

@ -18,11 +18,13 @@ import org.eclipse.cdt.internal.core.pdom.indexer.AbstractPDOMIndexer;
public class FakeIndexer extends AbstractPDOMIndexer {
static final String ID = "org.eclipse.cdt.core.tests.FakeIndexer";
@Override
public IPDOMIndexerTask createTask(ITranslationUnit[] added,
ITranslationUnit[] changed, ITranslationUnit[] removed) {
return null;
}
@Override
public String getID() {
return ID;
}

View file

@ -115,6 +115,7 @@ public class IndexIncludeTest extends IndexTestBase {
waitForIndexer();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
file.setContents(new ByteArrayInputStream("int included; int CONTEXT;\n".getBytes()), false, false, npm());
file.setLocalTimeStamp(timestamp + 1000);
@ -501,6 +502,7 @@ public class IndexIncludeTest extends IndexTestBase {
h1Contents.replace(pos, pos + "int".length(), "float");
}
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
h1.setContents(new ByteArrayInputStream(h1Contents.toString().getBytes()), false, false, npm());
h1.setLocalTimeStamp(timestamp + 1000);
@ -582,6 +584,7 @@ public class IndexIncludeTest extends IndexTestBase {
final long t1= System.currentTimeMillis();
final String changedContents = contents[4].toString();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
h1.setContents(new ByteArrayInputStream(changedContents.getBytes()), false, false, npm());
h1.setLocalTimeStamp(t1 + 1000);
@ -606,6 +609,7 @@ public class IndexIncludeTest extends IndexTestBase {
// Change h1.h back to the original state without the pragma-once semantics.
final long t2= System.currentTimeMillis();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
h1.setContents(new ByteArrayInputStream(h1Contents.toString().getBytes()), false, false, npm());
h1.setLocalTimeStamp(t2 + 2000);

View file

@ -58,6 +58,7 @@ public class IndexListenerTest extends BaseTestCase {
assertTrue(im.joinIndexer(10000, npm()));
IIndexerStateListener listener = new IIndexerStateListener() {
@Override
public void indexChanged(IIndexerStateEvent event) {
synchronized (mutex) {
if (event.indexerIsIdle()) {
@ -100,6 +101,7 @@ public class IndexListenerTest extends BaseTestCase {
assertTrue(im.joinIndexer(10000, npm()));
IIndexChangeListener listener = new IIndexChangeListener() {
@Override
public void indexChanged(IIndexChangeEvent event) {
if (!event.getFilesWritten().isEmpty()) {
synchronized (mutex) {

View file

@ -211,9 +211,11 @@ public class IndexProviderManagerTest extends IndexTestBase {
new MockPDOM("contentID.bar", "91"),
new MockPDOM("contentID.baz", "89")
};
@Override
public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) {
return fragments;
}
@Override
public boolean providesFor(ICProject project) throws CoreException {
return true;
}
@ -223,9 +225,11 @@ public class IndexProviderManagerTest extends IndexTestBase {
new MockPDOM("contentID.baz", "90"),
new MockPDOM("contentID.contentA", "38"),
};
@Override
public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) {
return fragments;
}
@Override
public boolean providesFor(ICProject project) throws CoreException {
return true;
}
@ -267,9 +271,11 @@ public class IndexProviderManagerTest extends IndexTestBase {
new MockPDOM("contentID.bar", "91"),
new MockPDOM("contentID.baz", "89")
};
@Override
public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) {
return fragments;
}
@Override
public boolean providesFor(ICProject project) throws CoreException {
return true;
}
@ -278,9 +284,11 @@ public class IndexProviderManagerTest extends IndexTestBase {
IIndexFragment[] fragments= new IIndexFragment[] {
new MockPDOM("contentID.contentA", "41"),
};
@Override
public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) {
return fragments;
}
@Override
public boolean providesFor(ICProject project) throws CoreException {
return true;
}
@ -520,6 +528,7 @@ class MockStateIndexProvider implements IIndexProvider {
this.targetProject = cproject;
}
@Override
public boolean providesFor(ICProject cproject) throws CoreException {
return this.targetProject.equals(cproject);
}
@ -542,6 +551,7 @@ class MockStateIndexFragmentProvider extends MockStateIndexProvider implements I
}
}
@Override
public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) throws CoreException {
int index = MockState.states.indexOf(config.getId());
index = invert ? (fragments.length-1)-index : index;
@ -564,145 +574,199 @@ class MockConfig implements ICConfigurationDescription {
this.project= project;
}
@Override
public String getId() {
return id;
}
@Override
public ICConfigExtensionReference create(String extensionPoint,
String extension) throws CoreException {
return null;
}
@Override
public ICExternalSetting createExternalSetting(String[] languageIDs,
String[] contentTypeIds, String[] extensions,
ICSettingEntry[] entries) throws WriteAccessException {
return null;
}
@Override
public ICFileDescription createFileDescription(IPath path,
ICResourceDescription base) throws CoreException,
WriteAccessException {
return null;
}
@Override
public ICFolderDescription createFolderDescription(IPath path,
ICFolderDescription base) throws CoreException,
WriteAccessException {
return null;
}
@Override
public ICConfigExtensionReference[] get(String extensionPointID) {
return null;
}
@Override
public ICBuildSetting getBuildSetting() {
return null;
}
@Override
public String getBuildSystemId() {
return null;
}
@Override
public ICdtVariablesContributor getBuildVariablesContributor() {
return null;
}
@Override
public CConfigurationData getConfigurationData() {
return null;
}
@Override
public String getDescription() {
return null;
}
@Override
public ICExternalSetting[] getExternalSettings() {
return null;
}
@Override
public ICFileDescription[] getFileDescriptions() {
return null;
}
@Override
public ICFolderDescription[] getFolderDescriptions() {
return null;
}
@Override
public ICProjectDescription getProjectDescription() {
return CoreModel.getDefault().getProjectDescription(project);
}
@Override
public Map getReferenceInfo() {
return null;
}
@Override
public ICResourceDescription getResourceDescription(IPath path,
boolean exactPath) {
return null;
}
@Override
public ICResourceDescription[] getResourceDescriptions() {
return null;
}
@Override
public ICFolderDescription getRootFolderDescription() {return null;}
@Override
public Object getSessionProperty(QualifiedName name) {return null;}
@Override
public ICSourceEntry[] getSourceEntries() {return null;}
@Override
public ICTargetPlatformSetting getTargetPlatformSetting() {return null;}
@Override
public boolean isActive() {return false;}
@Override
public boolean isModified() {return false;}
@Override
public boolean isPreferenceConfiguration() {return false;}
@Override
public void remove(ICConfigExtensionReference ext) throws CoreException {}
@Override
public void remove(String extensionPoint) throws CoreException {}
@Override
public void removeExternalSetting(ICExternalSetting setting) throws WriteAccessException {}
@Override
public void removeExternalSettings() throws WriteAccessException {}
@Override
public void removeResourceDescription(ICResourceDescription des)
throws CoreException, WriteAccessException {}
@Override
public void setActive() throws WriteAccessException {}
@Override
public void setConfigurationData(String buildSystemId,
CConfigurationData data) throws WriteAccessException {}
@Override
public void setDescription(String des) throws WriteAccessException {}
@Override
public void setName(String name) throws WriteAccessException {}
@Override
public void setReferenceInfo(Map<String, String> refs) throws WriteAccessException {}
@Override
public void setSessionProperty(QualifiedName name, Object value) {}
@Override
public void setSourceEntries(ICSourceEntry[] entries) throws CoreException,
WriteAccessException {}
@Override
public ICSettingObject[] getChildSettings() {return null;}
@Override
public ICConfigurationDescription getConfiguration() {return null;}
@Override
public String getName() {return null;}
@Override
public ICSettingContainer getParent() {return null;}
@Override
public int getType() {return 0;}
@Override
public boolean isReadOnly() {return false;}
@Override
public boolean isValid() {return false;}
@Override
public ICStorageElement getStorage(String id, boolean create) throws CoreException {
return null;
}
@Override
public ICStorageElement importStorage(String id, ICStorageElement storage) {
return null;
}
@Override
public void removeStorage(String id) throws CoreException {
}
@Override
public ICLanguageSetting getLanguageSettingForFile(IPath path, boolean ignoreExludeStatus) {
return null;
}
@Override
public String[] getExternalSettingsProviderIds() {
return null;
}
@Override
public void setExternalSettingsProviderIds(String[] ids) {}
@Override
public void updateExternalSettingsProviders(String[] ids) {}
@Override
public ICSourceEntry[] getResolvedSourceEntries() {
return null;
}
@Override
public CConfigurationStatus getConfigurationStatus() {
return CConfigurationStatus.CFG_STATUS_OK;
}
@Override
public void setReadOnly(boolean readOnly, boolean keepModify) {}
}

View file

@ -291,6 +291,7 @@ public class IndexSearchTest extends IndexTestBase {
PDOM pdom= (PDOM) ((CIndex) fIndex).getPrimaryFragments()[0];
pdom.accept(new IPDOMVisitor() {
LinkedList stack= new LinkedList();
@Override
public boolean visit(IPDOMNode node) throws CoreException {
if (!stack.isEmpty()) {
Object last= stack.getLast();
@ -301,6 +302,7 @@ public class IndexSearchTest extends IndexTestBase {
stack.add(node);
return true;
}
@Override
public void leave(IPDOMNode node) throws CoreException {
assertEquals(stack.removeLast(), node);
}

View file

@ -39,6 +39,7 @@ public class IndexTestBase extends BaseTestCase {
final ICProject[] result= new ICProject[] {null};
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
workspace.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
String name= "IndexTest_" + System.currentTimeMillis();
if (useCpp) {

View file

@ -101,6 +101,7 @@ public class TeamSharedIndexTest extends IndexTestBase {
try {
final IProject prjHandle= workspace.getRoot().getProject(prjName);
workspace.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
IProjectDescription desc= IDEWorkbenchPlugin.getPluginWorkspace().newProjectDescription(prjName);
prjHandle.create(desc, npm());

View file

@ -31,6 +31,7 @@ public class BTreeExpensiveTests extends BTreeTests {
}
// @Override
@Override
public void testInsertion() throws Exception {
super.testInsertion();
}

View file

@ -38,6 +38,7 @@ public class CCompositeTypeTests extends PDOMTestBase {
return new TestSuite(CCompositeTypeTests.class);
}
@Override
protected void setUp() throws Exception {
CCompositeTypeTests foo = null;
@ -46,6 +47,7 @@ public class CCompositeTypeTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -32,6 +32,7 @@ public class CPPCompositeTypeTests extends PDOMTestBase {
return new TestSuite(CPPCompositeTypeTests.class);
}
@Override
protected void setUp() throws Exception {
CPPCompositeTypeTests foo = null;
@ -40,6 +41,7 @@ public class CPPCompositeTypeTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
}

View file

@ -39,12 +39,14 @@ public class CPPFieldTests extends PDOMTestBase {
return suite(CPPFieldTests.class);
}
@Override
protected void setUp() throws Exception {
project = createProject("fieldTests");
pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project);
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -35,12 +35,14 @@ public class CPPVariableTests extends PDOMTestBase {
return suite(CPPVariableTests.class);
}
@Override
protected void setUp() throws Exception {
project = createProject("variableTests");
pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project);
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -35,12 +35,14 @@ public class CVariableTests extends PDOMTestBase {
return suite(CVariableTests.class);
}
@Override
protected void setUp() throws Exception {
project = createProject("variableTests");
pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project);
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -34,6 +34,7 @@ public class DBPropertiesTests extends BaseTestCase {
return suite(DBPropertiesTests.class);
}
@Override
protected void setUp() throws Exception {
dbLoc = File.createTempFile("test", "db");
dbLoc.deleteOnExit();
@ -41,6 +42,7 @@ public class DBPropertiesTests extends BaseTestCase {
db.setExclusiveLock();
}
@Override
protected void tearDown() throws Exception {
db.close();
}

View file

@ -59,6 +59,7 @@ public class DefDeclTests extends PDOMTestBase {
return suite(DefDeclTests.class);
}
@Override
protected void setUp() throws Exception {
String requiredName = "defDeclTests";
cproject = createProject(requiredName);
@ -67,6 +68,7 @@ public class DefDeclTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (cproject != null) {

View file

@ -40,6 +40,7 @@ public class EnumerationTests extends PDOMTestBase {
return suite(EnumerationTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
ICProject project = createProject("enumerationTests");
@ -48,6 +49,7 @@ public class EnumerationTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
}
@ -63,6 +65,7 @@ public class EnumerationTests extends PDOMTestBase {
assertEquals(3, enumerators.length);
// Enumerators are returned in arbitrary order. Sort them to make checking easier.
Arrays.sort(enumerators, new Comparator<IEnumerator>() {
@Override
public int compare(IEnumerator o1, IEnumerator o2) {
return o1.getName().compareTo(o2.getName());
}
@ -101,6 +104,7 @@ public class EnumerationTests extends PDOMTestBase {
assertEquals(3, enumerators.length);
// Enumerators are returned in arbitrary order. Sort them to make checking easier.
Arrays.sort(enumerators, new Comparator<IEnumerator>() {
@Override
public int compare(IEnumerator o1, IEnumerator o2) {
return o1.getName().compareTo(o2.getName());
}

View file

@ -41,6 +41,7 @@ public class FilesOnReindexTests extends PDOMTestBase {
return suite(FilesOnReindexTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
project = createProject("filesOnReindex");
@ -49,6 +50,7 @@ public class FilesOnReindexTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -36,6 +36,7 @@ public class IncludesTests extends PDOMTestBase {
return suite(IncludesTests.class);
}
@Override
protected void setUp() throws Exception {
if (index == null) {
project = createProject("includesTests");
@ -44,6 +45,7 @@ public class IncludesTests extends PDOMTestBase {
index.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
index.releaseReadLock();
}

View file

@ -47,6 +47,7 @@ public class NamespaceTests extends PDOMTestBase {
return suite(NamespaceTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
project = createProject("namespaceTests", true);
@ -55,6 +56,7 @@ public class NamespaceTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
if (project != null) {

View file

@ -38,6 +38,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase {
return suite(OverloadsWithinCommonHeaderTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
ICProject project = createProject("overloadsWithinCommonHeader", true);
@ -46,6 +47,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
}

View file

@ -36,6 +36,7 @@ public class OverloadsWithinSingleTUTests extends PDOMTestBase {
return suite(OverloadsWithinSingleTUTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
ICProject project = createProject("overloadsWithinSingleTU");
@ -44,6 +45,7 @@ public class OverloadsWithinSingleTUTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
}

View file

@ -31,6 +31,7 @@ public class PDOMPrettyPrinter implements IPDOMVisitor {
StringBuilder indent = new StringBuilder();
final String step = " "; //$NON-NLS-1$
@Override
public void leave(IPDOMNode node) throws CoreException {
// if (node instanceof PDOMCPPClassTemplate) {
// ((PDOMCPPClassTemplate) node).specializationsAccept(this);
@ -39,6 +40,7 @@ public class PDOMPrettyPrinter implements IPDOMVisitor {
indent.setLength(indent.length() - step.length());
}
@Override
public boolean visit(IPDOMNode node) throws CoreException {
indent.append(step);
StringBuilder sb= new StringBuilder();
@ -78,10 +80,12 @@ public class PDOMPrettyPrinter implements IPDOMVisitor {
final PDOMLinkage linkage = pdom.getLinkage(linkageID);
if (linkage != null) {
linkage.getIndex().accept(new IBTreeVisitor() {
@Override
public int compare(long record) throws CoreException {
return 0;
}
@Override
public boolean visit(long record) throws CoreException {
if (record == 0)
return false;

View file

@ -82,14 +82,17 @@ public class PDOMProviderTests extends PDOMTestBase {
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
new IReadOnlyPDOMProvider() {
@Override
public IPDOMDescriptor[] getDescriptors(
ICConfigurationDescription config) {
return new IPDOMDescriptor[] {
new IPDOMDescriptor() {
@Override
public IIndexLocationConverter getIndexLocationConverter() {
return new URIRelativeLocationConverter(baseURI);
}
@Override
public IPath getLocation() {
return new Path(tempPDOM.getAbsolutePath());
}
@ -97,6 +100,7 @@ public class PDOMProviderTests extends PDOMTestBase {
}
};
}
@Override
public boolean providesFor(ICProject project)
throws CoreException {
return cproject2.equals(project);
@ -161,14 +165,17 @@ public class PDOMProviderTests extends PDOMTestBase {
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
new IReadOnlyPDOMProvider() {
@Override
public IPDOMDescriptor[] getDescriptors(
ICConfigurationDescription config) {
return new IPDOMDescriptor[] {
new IPDOMDescriptor() {
@Override
public IIndexLocationConverter getIndexLocationConverter() {
return new URIRelativeLocationConverter(baseURI);
}
@Override
public IPath getLocation() {
return new Path(tempPDOM.getAbsolutePath());
}
@ -176,6 +183,7 @@ public class PDOMProviderTests extends PDOMTestBase {
}
};
}
@Override
public boolean providesFor(ICProject project)
throws CoreException {
return cproject2.equals(project) || cproject3.equals(project);
@ -278,14 +286,17 @@ public class PDOMProviderTests extends PDOMTestBase {
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
new IReadOnlyPDOMProvider() {
@Override
public IPDOMDescriptor[] getDescriptors(
ICConfigurationDescription config) {
return new IPDOMDescriptor[] {
new IPDOMDescriptor() {
@Override
public IIndexLocationConverter getIndexLocationConverter() {
return new URIRelativeLocationConverter(baseURI);
}
@Override
public IPath getLocation() {
return new Path(tempPDOM.getAbsolutePath());
}
@ -293,6 +304,7 @@ public class PDOMProviderTests extends PDOMTestBase {
}
};
}
@Override
public boolean providesFor(ICProject project)
throws CoreException {
return cproject2.equals(project);

View file

@ -45,6 +45,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
*/
public class PDOMSearchTest extends PDOMTestBase {
final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
@Override
public int compare(IBinding o1, IBinding o2) {
return o1.getName().compareTo(o2.getName());
}};

View file

@ -73,6 +73,7 @@ public class PDOMTestBase extends BaseTestCase {
final File rootDir = CTestPlugin.getDefault().getFileInPlugin(rootPath.append(folderName));
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
workspace.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
// Create the project
ICProject cproject= cpp ? CProjectHelper.createCCProject(projectName, null, IPDOMManager.ID_NO_INDEXER)
@ -81,6 +82,7 @@ public class PDOMTestBase extends BaseTestCase {
// Import the files at the root
ImportOperation importOp = new ImportOperation(cproject.getProject().getFullPath(),
rootDir, FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() {
@Override
public String queryOverwrite(String pathString) {
return IOverwriteQuery.ALL;
}

View file

@ -42,6 +42,7 @@ public class TypesTests extends PDOMTestBase {
return suite(TypesTests.class);
}
@Override
protected void setUp() throws Exception {
if (pdom == null) {
ICProject project = createProject("types");
@ -50,6 +51,7 @@ public class TypesTests extends PDOMTestBase {
pdom.acquireReadLock();
}
@Override
protected void tearDown() throws Exception {
pdom.releaseReadLock();
}

View file

@ -103,6 +103,7 @@ abstract public class BaseTestFramework extends TestCase {
initProject();
}
@Override
protected void tearDown() throws Exception {
if (project == null || !project.exists())
return;

View file

@ -45,7 +45,8 @@ public class FailingTest extends TestCase {
/* (non-Javadoc)
* @see junit.framework.Test#run(junit.framework.TestResult)
*/
public void run( TestResult result ) {
@Override
public void run( TestResult result ) {
result.startTest( this );
TestResult r = new TestResult();

View file

@ -40,6 +40,7 @@ public class AISResultPrinter extends ResultPrinter {
/* (non-Javadoc)
* @see junit.framework.TestListener#addFailure(junit.framework.Test, junit.framework.AssertionFailedError)
*/
@Override
public void addFailure(Test test, AssertionFailedError t) {
super.addFailure(test, t);
getWriter().print("---> ");
@ -48,6 +49,7 @@ public class AISResultPrinter extends ResultPrinter {
/* (non-Javadoc)
* @see junit.framework.TestListener#addError(junit.framework.Test, java.lang.Throwable)
*/
@Override
public void addError(Test test, Throwable t) {
super.addError(test, t);
getWriter().print("---> ");
@ -56,6 +58,7 @@ public class AISResultPrinter extends ResultPrinter {
/* (non-Javadoc)
* @see junit.framework.TestListener#startTest(junit.framework.Test)
*/
@Override
public void startTest(Test test) {
getWriter().print(".");
}

View file

@ -23,6 +23,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator
/*
* @see ILabelDecorator#decorateImage(Image, Object)
*/
@Override
public Image decorateImage(Image image, Object element) {
return null;
}
@ -30,6 +31,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator
/*
* @see ILabelDecorator#decorateText(String, Object)
*/
@Override
public String decorateText(String text, Object element) {
return text + "*";
}

View file

@ -67,6 +67,7 @@ import org.osgi.framework.Bundle;
public class CProjectHelper {
private final static IOverwriteQuery OVERWRITE_QUERY= new IOverwriteQuery() {
@Override
public String queryOverwrite(String file) {
return ALL;
}
@ -84,6 +85,7 @@ public class CProjectHelper {
final ICProject newProject[] = new ICProject[1];
ws.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
IWorkspaceRoot root = ws.getRoot();
IProject project = root.getProject(projectName);
@ -165,6 +167,7 @@ public class CProjectHelper {
final String finalCfgProviderId = cfgProviderId;
ws.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
IWorkspaceRoot root = ws.getRoot();
IProject project = root.getProject(projectName);
@ -219,6 +222,7 @@ public class CProjectHelper {
final ICProject newProject[] = new ICProject[1];
ws.run(new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
ICProject cproject = createCProject(projectName, binFolderName, indexerID);
if (!cproject.getProject().hasNature(CCProjectNature.CC_NATURE_ID)) {

Some files were not shown because too many files have changed in this diff Show more