mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix content assist JUnit failures

Browse source
This commit is contained in:
Anton Leherbauer 2007-12-12 09:32:54 +00:00
parent 7157df9421
commit a538cde466
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
View file

@ -63,7 +63,7 @@ public class ContentAssistTests extends BaseUITestCase {
//(CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset(); //(CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset();
if (project == null) { if (project == null) {
ICProject cPrj; ICProject cPrj;
try { try {
cPrj = CProjectHelper.createCCProject("ContentAssistTestProject", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ cPrj = CProjectHelper.createCCProject("ContentAssistTestProject", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$
@ -119,16 +119,16 @@ public class ContentAssistTests extends BaseUITestCase {
} }
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
if( project == null || !project.exists() ) if( project == null || !project.exists() )
return; return;
closeAllEditors(); closeAllEditors();
IResource [] members = project.members(); IResource [] members = project.members();
for( int i = 0; i < members.length; i++ ){ for( int i = 0; i < members.length; i++ ){
if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cdtproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$ if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$
continue; continue;
if (members[i].getName().equals(".settings")) if (members[i].getName().equals(".settings"))
continue; continue;
try{ try{
members[i].delete( false, monitor ); members[i].delete( false, monitor );
@ -136,14 +136,14 @@ public class ContentAssistTests extends BaseUITestCase {
/*boo*/ /*boo*/
} }
} }
project= null;
} }
protected IFile importFile(String fileName, String contents ) throws Exception{ protected IFile importFile(String fileName, String contents ) throws Exception{
//Obtain file handle //Obtain file handle
IFile file = project.getProject().getFile(fileName); IFile file = project.getProject().getFile(fileName);
InputStream stream = new ByteArrayInputStream( contents.getBytes() ); InputStream stream = new ByteArrayInputStream( contents.getBytes() );
//Create file input stream //Create file input stream
if( file.exists() ) if( file.exists() )
file.setContents( stream, false, false, monitor ); file.setContents( stream, false, false, monitor );
@ -226,7 +226,7 @@ public class ContentAssistTests extends BaseUITestCase {
assertEquals( "IDIOT", results[1].getDisplayString() ); //$NON-NLS-1$ assertEquals( "IDIOT", results[1].getDisplayString() ); //$NON-NLS-1$
assertEquals( "NORMAL", results[2].getDisplayString() ); //$NON-NLS-1$ assertEquals( "NORMAL", results[2].getDisplayString() ); //$NON-NLS-1$
// in a method definition context, constructors and methods should be proposed // in a method definition context, constructors and methods should be proposed
c2 = code + "return 0;}\nStrategy::\n"; //$NON-NLS-1$ c2 = code + "return 0;}\nStrategy::\n"; //$NON-NLS-1$