1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00

Renamed few classes to distinguish tests from their base classes.

This commit is contained in:
Sergey Prigogin 2013-01-23 10:55:42 -08:00
parent 0e8a8cd06d
commit 71430cbc15
45 changed files with 76 additions and 76 deletions

View file

@ -35,7 +35,7 @@ import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase;
import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
@ -83,7 +83,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
protected IASTTranslationUnit parse(String code, ParserLanguage lang, boolean gcc) {
FileContent codeReader = FileContent.create("code.c", code.toCharArray());
IScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner = AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner = AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser2 = null;
if (lang == ParserLanguage.CPP) {
ICPPParserExtensionConfiguration config = null;

View file

@ -32,7 +32,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
/**
* @author dsteffle
*/
public class FileBasePluginTest extends TestCase {
public class FileBasePluginTestCase extends TestCase {
static NullProgressMonitor monitor;
static IWorkspace workspace;
static IProject project;
@ -41,10 +41,10 @@ public class FileBasePluginTest extends TestCase {
static Class className;
static ICProject cPrj;
public FileBasePluginTest() {
public FileBasePluginTestCase() {
}
public FileBasePluginTest(String name) {
public FileBasePluginTestCase(String name) {
super(name);
}
@ -75,7 +75,7 @@ public class FileBasePluginTest extends TestCase {
}
}
public FileBasePluginTest(String name, Class className) {
public FileBasePluginTestCase(String name, Class className) {
super(name);
initialize(className);
}

View file

@ -29,7 +29,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* Tests for classes implementing IASTImplicitNameOwner interface.
*/
public class AST2CPPImplicitNameTests extends AST2BaseTest {
public class AST2CPPImplicitNameTests extends AST2TestBase {
public AST2CPPImplicitNameTests() {
}

View file

@ -46,7 +46,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
/**
* Examples taken from the c++-specification.
*/
public class AST2CPPSpecTest extends AST2SpecBaseTest {
public class AST2CPPSpecTest extends AST2SpecTestBase {
public AST2CPPSpecTest() {
}

View file

@ -139,7 +139,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
import org.eclipse.cdt.internal.core.index.IndexCPPSignatureUtil;
import org.eclipse.cdt.internal.core.parser.ParserException;
public class AST2CPPTests extends AST2BaseTest {
public class AST2CPPTests extends AST2TestBase {
public AST2CPPTests() {
}

View file

@ -15,7 +15,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* @author dsteffle
*/
public class AST2CSpecTest extends AST2SpecBaseTest {
public class AST2CSpecTest extends AST2SpecTestBase {
public AST2CSpecTest() {
}

View file

@ -35,7 +35,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
/**
* @author dsteffle
*/
public class AST2FileBasePluginTest extends TestCase {
public class AST2FileBasePluginTestCase extends TestCase {
static NullProgressMonitor monitor;
static IWorkspace workspace;
static IProject project;
@ -44,10 +44,10 @@ public class AST2FileBasePluginTest extends TestCase {
static Class className;
static ICProject cPrj;
public AST2FileBasePluginTest() {
public AST2FileBasePluginTestCase() {
}
public AST2FileBasePluginTest(String name) {
public AST2FileBasePluginTestCase(String name) {
super(name);
}
@ -79,7 +79,7 @@ public class AST2FileBasePluginTest extends TestCase {
}
}
public AST2FileBasePluginTest(String name, Class className) {
public AST2FileBasePluginTestCase(String name, Class className) {
super(name);
initialize(className);
}

View file

@ -59,7 +59,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.ICInternalBinding;
/**
* @author dsteffle
*/
public class AST2KnRTests extends AST2BaseTest {
public class AST2KnRTests extends AST2TestBase {
public AST2KnRTests() {
}

View file

@ -48,7 +48,7 @@ import org.eclipse.core.resources.IFile;
/**
* @author dsteffle
*/
public class AST2SelectionParseTest extends AST2SelectionParseBaseTest {
public class AST2SelectionParseTest extends AST2SelectionParseTestBase {
public AST2SelectionParseTest() {
}

View file

@ -29,7 +29,7 @@ import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.FileBasePluginTest;
import org.eclipse.cdt.core.parser.tests.FileBasePluginTestCase;
import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
@ -40,18 +40,18 @@ import org.eclipse.core.resources.IFile;
/**
* @author dsteffle
*/
public class AST2SelectionParseBaseTest extends FileBasePluginTest {
public class AST2SelectionParseTestBase extends FileBasePluginTestCase {
public AST2SelectionParseBaseTest() {
public AST2SelectionParseTestBase() {
}
public AST2SelectionParseBaseTest(String name) {
public AST2SelectionParseTestBase(String name) {
super(name);
}
private static final IParserLogService NULL_LOG = new NullLogService();
public AST2SelectionParseBaseTest(String name, Class className) {
public AST2SelectionParseTestBase(String name, Class className) {
super(name, className);
}
@ -76,7 +76,7 @@ public class AST2SelectionParseBaseTest extends FileBasePluginTest {
protected IASTTranslationUnit parse(String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems) throws ParserException {
FileContent codeReader = FileContent.create("<test-code>", code.toCharArray());
ScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser2 = null;
if (lang == ParserLanguage.CPP) {

View file

@ -41,12 +41,12 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
/**
* @author dsteffle
*/
public class AST2SpecBaseTest extends AST2BaseTest {
public AST2SpecBaseTest() {
public class AST2SpecTestBase extends AST2TestBase {
public AST2SpecTestBase() {
super();
}
public AST2SpecBaseTest(String name) {
public AST2SpecTestBase(String name) {
super(name);
}
@ -101,7 +101,7 @@ public class AST2SpecBaseTest extends AST2BaseTest {
boolean useGNUExtensions, boolean expectNoProblems, boolean checkBindings,
int expectedProblemBindings, String[] problems) throws ParserException {
ScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser2 = null;
if (lang == ParserLanguage.CPP) {

View file

@ -103,7 +103,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
import org.eclipse.cdt.internal.core.parser.ParserException;
public class AST2TemplateTests extends AST2BaseTest {
public class AST2TemplateTests extends AST2TestBase {
public AST2TemplateTests() {
}

View file

@ -95,7 +95,7 @@ import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor;
/**
* @author aniefer
*/
public class AST2BaseTest extends BaseTestCase {
public class AST2TestBase extends BaseTestCase {
public final static String TEST_CODE = "<testcode>";
protected static final IParserLogService NULL_LOG = new NullLogService();
protected static boolean sValidateCopy;
@ -121,11 +121,11 @@ public class AST2BaseTest extends BaseTestCase {
return map;
}
public AST2BaseTest() {
public AST2TestBase() {
super();
}
public AST2BaseTest(String name) {
public AST2TestBase(String name) {
super(name);
}

View file

@ -128,7 +128,7 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
/**
* Test cases on the AST.
*/
public class AST2Tests extends AST2BaseTest {
public class AST2Tests extends AST2TestBase {
private static final int NUM_TESTS = 3;
public static TestSuite suite() {

View file

@ -17,7 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.parser.ParserLanguage;
public class AST2UtilOldTests extends AST2BaseTest {
public class AST2UtilOldTests extends AST2TestBase {
public AST2UtilOldTests() {
}
public AST2UtilOldTests(String name) {

View file

@ -27,7 +27,7 @@ import org.eclipse.cdt.internal.core.parser.scanner.ExpressionEvaluator;
/**
* @author dsteffle
*/
public class AST2UtilTests extends AST2BaseTest {
public class AST2UtilTests extends AST2TestBase {
public AST2UtilTests() {
}

View file

@ -19,7 +19,7 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.parser.ParserLanguage;
public class ASTCPPSpecDefectTests extends AST2BaseTest {
public class ASTCPPSpecDefectTests extends AST2TestBase {
public ASTCPPSpecDefectTests() {
}

View file

@ -28,7 +28,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* Testcases for inactive code in ast.
*/
public class ASTInactiveCodeTests extends AST2BaseTest {
public class ASTInactiveCodeTests extends AST2TestBase {
public static TestSuite suite() {
return suite(ASTInactiveCodeTests.class);

View file

@ -28,7 +28,7 @@ import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser;
public class ASTNodeSelectorTest extends AST2BaseTest {
public class ASTNodeSelectorTest extends AST2TestBase {
static public TestSuite suite() {
return suite(ASTNodeSelectorTest.class);
@ -55,7 +55,7 @@ public class ASTNodeSelectorTest extends AST2BaseTest {
fCode= getContents(1)[0].toString();
FileContent codeReader = FileContent.create("<test-code>", fCode.toCharArray());
ScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner= AST2BaseTest.createScanner(codeReader, ParserLanguage.CPP, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, ParserLanguage.CPP, ParserMode.COMPLETE_PARSE, scannerInfo);
GNUCPPSourceParser parser= new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, new NullLogService(), new GPPParserExtensionConfiguration());
fTu= parser.parse();
fSelector= fTu.getNodeSelector(null);

View file

@ -18,7 +18,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.AccessContext;
import org.eclipse.cdt.internal.core.parser.ParserException;
public class AccessControlTests extends AST2BaseTest {
public class AccessControlTests extends AST2TestBase {
protected class AccessAssertionHelper extends BindingAssertionHelper {
AccessAssertionHelper(String contents) throws ParserException {

View file

@ -13,22 +13,22 @@ package org.eclipse.cdt.core.parser.tests.ast2;
import org.eclipse.cdt.core.dom.CDOM;
import org.eclipse.cdt.core.dom.IASTServiceProvider.UnsupportedDialectException;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.parser.tests.FileBasePluginTest;
import org.eclipse.cdt.core.parser.tests.FileBasePluginTestCase;
import org.eclipse.core.resources.IFile;
/**
* @author dsteffle
*/
public class CDOMBaseTest extends FileBasePluginTest {
public class CDOMTestBase extends FileBasePluginTestCase {
public CDOMBaseTest() {
public CDOMTestBase() {
}
public CDOMBaseTest(String name) {
public CDOMTestBase(String name) {
super(name);
}
public CDOMBaseTest(String name, Class className) {
public CDOMTestBase(String name, Class className) {
super(name, className);
}

View file

@ -26,7 +26,7 @@ import org.eclipse.core.runtime.jobs.Job;
/**
* @author dsteffle
*/
public class CodeReaderCacheTest extends CDOMBaseTest {
public class CodeReaderCacheTest extends CDOMTestBase {
public CodeReaderCacheTest() {
}

View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
* @author Guido Zgraggen
*
*/
public class CommentTests extends AST2BaseTest {
public class CommentTests extends AST2TestBase {
public static TestSuite suite() {
return suite(CommentTests.class);

View file

@ -177,7 +177,7 @@ public class CompleteParser2Tests extends BaseTestCase {
FileContent codeReader = FileContent.create("<test-code>", code.toCharArray());
ScannerInfo scannerInfo = new ScannerInfo();
ISourceCodeParser parser2 = null;
IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
if (lang == ParserLanguage.CPP) {
ICPPParserExtensionConfiguration config = null;
if (gcc)

View file

@ -19,7 +19,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNode;
* @author jcamelon
*
*/
public class DOMGCCSelectionParseExtensionsTest extends DOMSelectionParseBaseTest {
public class DOMGCCSelectionParseExtensionsTest extends DOMSelectionParseTestBase {
public DOMGCCSelectionParseExtensionsTest() {
}

View file

@ -44,7 +44,7 @@ import org.eclipse.core.runtime.content.IContentType;
/**
* @author jcamelon
*/
public class DOMLocationInclusionTests extends AST2FileBasePluginTest {
public class DOMLocationInclusionTests extends AST2FileBasePluginTestCase {
public DOMLocationInclusionTests() {
}

View file

@ -35,7 +35,7 @@ import org.eclipse.cdt.core.dom.ast.IMacroBinding;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.internal.core.parser.ParserException;
public class DOMLocationMacroTests extends AST2BaseTest {
public class DOMLocationMacroTests extends AST2TestBase {
final ParserLanguage[] languages = new ParserLanguage[] { ParserLanguage.C, ParserLanguage.CPP };

View file

@ -73,7 +73,7 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
/**
* @author jcamelon
*/
public class DOMLocationTests extends AST2BaseTest {
public class DOMLocationTests extends AST2TestBase {
public DOMLocationTests() {
}

View file

@ -32,7 +32,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
* @author Emanuel Graf
*
*/
public class DOMPreprocessorInformationTest extends AST2BaseTest {
public class DOMPreprocessorInformationTest extends AST2TestBase {
public void testPragma() throws Exception {
String msg = "GCC poison printf sprintf fprintf";

View file

@ -44,7 +44,7 @@ import org.eclipse.core.resources.IFile;
/**
* @author dsteffle
*/
public class DOMSelectionParseTest extends DOMSelectionParseBaseTest {
public class DOMSelectionParseTest extends DOMSelectionParseTestBase {
public DOMSelectionParseTest() {
}

View file

@ -23,16 +23,16 @@ import org.eclipse.core.resources.IFile;
* @author johnc
*
*/
public class DOMSelectionParseBaseTest extends DOMFileBasePluginTest {
public class DOMSelectionParseTestBase extends DOMFileBasePluginTest {
public DOMSelectionParseBaseTest() {
public DOMSelectionParseTestBase() {
}
public DOMSelectionParseBaseTest(String name) {
public DOMSelectionParseTestBase(String name) {
super(name);
}
public DOMSelectionParseBaseTest(String name, Class className) {
public DOMSelectionParseTestBase(String name, Class className) {
super(name, className);
}

View file

@ -30,7 +30,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* Testcases related to recovery from invalid syntax.
*/
public class FaultToleranceTests extends AST2BaseTest {
public class FaultToleranceTests extends AST2TestBase {
public static TestSuite suite() {
return suite(FaultToleranceTests.class);

View file

@ -31,7 +31,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.CFunction;
import org.eclipse.cdt.internal.core.model.ASTStringUtil;
import org.eclipse.cdt.internal.core.parser.ParserException;
public class GCCCompleteParseExtensionsTest extends AST2BaseTest {
public class GCCCompleteParseExtensionsTest extends AST2TestBase {
public GCCCompleteParseExtensionsTest() {
}

View file

@ -29,7 +29,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* @author aniefer
*/
public class GCCTests extends AST2BaseTest {
public class GCCTests extends AST2TestBase {
public GCCTests() {
}

View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
/**
* @author jcamelon
*/
public class ImageLocationTests extends AST2BaseTest {
public class ImageLocationTests extends AST2TestBase {
private static final int CODE = IASTImageLocation.REGULAR_CODE;
private static final int MACRO = IASTImageLocation.MACRO_DEFINITION;

View file

@ -44,7 +44,7 @@ import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor;
/**
* Testcases for non-gnu language extensions.
*/
public class LanguageExtensionsTest extends AST2BaseTest {
public class LanguageExtensionsTest extends AST2TestBase {
protected static final int SIZEOF_EXTENSION = 0x1;
protected static final int FUNCTION_STYLE_ASM = 0x2;

View file

@ -1335,7 +1335,7 @@ public class QuickParser2Tests extends TestCase {
ParserLanguage lang, boolean gcc) throws Exception {
FileContent codeReader = FileContent.create("<test-code>", code.toCharArray());
IScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser2 = null;
if (lang == ParserLanguage.CPP) {
ICPPParserExtensionConfiguration config = null;

View file

@ -20,7 +20,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
/**
* Directly tests parts of the semantics package
*/
public class SemanticsTests extends AST2BaseTest {
public class SemanticsTests extends AST2TestBase {
public SemanticsTests() {}
public SemanticsTests(String name) { super(name); }

View file

@ -18,7 +18,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.internal.core.pdom.indexer.TodoTaskParser;
import org.eclipse.cdt.internal.core.pdom.indexer.TodoTaskParser.Task;
public class TaskParserTest extends AST2BaseTest {
public class TaskParserTest extends AST2TestBase {
public static TestSuite suite() {
return suite(TaskParserTest.class);

View file

@ -21,7 +21,7 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
/**
* Tests for ClassTypeHelper class.
*/
public class TypeTraitsTests extends AST2BaseTest {
public class TypeTraitsTests extends AST2TestBase {
public TypeTraitsTests() {
}

View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
/**
* Unit tests for CPPVariableReadWriteFlags and CVariableReadWriteFlags classes.
*/
public class VariableReadWriteFlagsTest extends AST2BaseTest {
public class VariableReadWriteFlagsTest extends AST2TestBase {
private static final int READ = PDOMName.READ_ACCESS;
private static final int WRITE = PDOMName.WRITE_ACCESS;

View file

@ -38,7 +38,7 @@ import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase;
import org.eclipse.cdt.core.testplugin.CTestPlugin;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
@ -53,7 +53,7 @@ public class CompletionTestBase extends BaseTestCase {
protected IASTCompletionNode getCompletionNode(String code, ParserLanguage lang, boolean useGNUExtensions) throws ParserException {
FileContent codeReader = FileContent.create("<test-code>", code.trim().toCharArray());
ScannerInfo scannerInfo = new ScannerInfo();
IScanner scanner= AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner= AST2TestBase.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser = null;
if( lang == ParserLanguage.CPP )

View file

@ -28,7 +28,7 @@ import org.eclipse.cdt.core.parser.NullLogService;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase;
import org.eclipse.cdt.core.parser.tests.rewrite.RewriteBaseTest;
import org.eclipse.cdt.core.parser.tests.rewrite.TestHelper;
import org.eclipse.cdt.core.parser.tests.rewrite.TestSourceFile;
@ -95,7 +95,7 @@ public class ASTWriterTest extends RewriteBaseTest {
ParserLanguage language = getLanguage(testFile);
boolean useGNUExtensions = getGNUExtension(testFile);
IScanner scanner = AST2BaseTest.createScanner(codeReader, language, ParserMode.COMPLETE_PARSE, scannerInfo);
IScanner scanner = AST2TestBase.createScanner(codeReader, language, ParserMode.COMPLETE_PARSE, scannerInfo);
ISourceCodeParser parser = null;
if (language == ParserLanguage.CPP) {

View file

@ -20,7 +20,7 @@ import junit.framework.TestSuite;
import org.eclipse.jface.text.IRegion;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase;
import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
import org.eclipse.cdt.ui.testplugin.CTestPlugin;
@ -31,7 +31,7 @@ import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder;
/**
* Tests for LinkedNamesFinder class.
*/
public class LinkedNamesFinderTest extends AST2BaseTest {
public class LinkedNamesFinderTest extends AST2TestBase {
private static class RegionComparator implements Comparator<IRegion> {
@Override
public int compare(IRegion r1, IRegion r2) {

View file

@ -29,7 +29,7 @@ import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.IncludeFileContentProvider;
import org.eclipse.cdt.core.parser.ParserUtil;
import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.tests.ast2.AST2BaseTest;
import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase;
import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase;
import org.eclipse.core.runtime.CoreException;
@ -136,7 +136,7 @@ public class ParseHelper {
public static IASTTranslationUnit parse(char[] code, ILanguage lang, Options options) {
return parse(FileContent.create(AST2BaseTest.TEST_CODE, code), lang, new ScannerInfo(), null, options);
return parse(FileContent.create(AST2TestBase.TEST_CODE, code), lang, new ScannerInfo(), null, options);
}
@ -254,7 +254,7 @@ public class ParseHelper {
IASTTranslationUnit tu;
try {
tu = language.getASTTranslationUnit(FileContent.create(AST2BaseTest.TEST_CODE, code.toCharArray()), new ScannerInfo(), null, null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService());
tu = language.getASTTranslationUnit(FileContent.create(AST2TestBase.TEST_CODE, code.toCharArray()), new ScannerInfo(), null, null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService());
} catch (CoreException e) {
throw new AssertionFailedError(e.toString());
}
@ -273,7 +273,7 @@ public class ParseHelper {
public static IASTCompletionNode getCompletionNode(String code, ILanguage language, int offset) {
try {
return language.getCompletionNode(FileContent.create(AST2BaseTest.TEST_CODE, code.toCharArray()), new ScannerInfo(), null, null, ParserUtil.getParserLogService(), offset);
return language.getCompletionNode(FileContent.create(AST2TestBase.TEST_CODE, code.toCharArray()), new ScannerInfo(), null, null, ParserUtil.getParserLogService(), offset);
} catch (CoreException e) {
throw new RuntimeException(e);
}