Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2016-03-22 14:19:26 +0000
committerDoug Schaefer2016-03-22 14:32:31 +0000
commitc29243b187cb113ae6817c81789b1839c8423e20 (patch)
treef6d3b38fbc9c6f2d13ecba4c5c184ce0b3e5b75e /build/org.eclipse.cdt.autotools.tests
parent52432d73702960aaab6810bbda22feb2f11dfdd1 (diff)
downloadorg.eclipse.cdt-c29243b187cb113ae6817c81789b1839c8423e20.tar.gz
org.eclipse.cdt-c29243b187cb113ae6817c81789b1839c8423e20.tar.xz
org.eclipse.cdt-c29243b187cb113ae6817c81789b1839c8423e20.zip
Revert "Bug 489563 - API change for Language Settings Providers."
This reverts the changes we've made for language settings providers so that I can start again with a cleaner approach. Change-Id: Icddd5a465a8f217594af5b07011a56bf1dfdf014
Diffstat (limited to 'build/org.eclipse.cdt.autotools.tests')
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/LibtoolGCCBuildCommandParserTest.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/LibtoolGCCBuildCommandParserTest.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/LibtoolGCCBuildCommandParserTest.java
index 0e18e4a203b..162d40ec2fc 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/LibtoolGCCBuildCommandParserTest.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/LibtoolGCCBuildCommandParserTest.java
@@ -25,10 +25,8 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
import org.eclipse.cdt.core.testplugin.ResourceHelper;
import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser;
-import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Adapters;
import org.junit.Test;
/**
@@ -63,8 +61,6 @@ public class LibtoolGCCBuildCommandParserTest {
IProject project = ResourceHelper.createCDTProjectWithConfig(projectName);
ICConfigurationDescription[] cfgDescriptions = getConfigurationDescriptions(project);
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
- IBuildConfiguration config = Adapters.adapt(cfgDescription, IBuildConfiguration.class);
- assertNotNull(config);
IFile file1 = ResourceHelper.createFile(project, "file1.cpp");
IFile file2 = ResourceHelper.createFile(project, "file2.cpp");
@@ -81,11 +77,11 @@ public class LibtoolGCCBuildCommandParserTest {
parser.processLine("libtool: compile: g++ -I/path0 file2.cpp");
parser.processLine("libtool: compile: cc -I/path0 file3.cpp");
parser.shutdown();
- List<ICLanguageSettingEntry> entries = parser.getSettingEntries(config, file1, languageId);
+ List<ICLanguageSettingEntry> entries = parser.getSettingEntries(cfgDescription, file1, languageId);
assertEquals(new CIncludePathEntry("/path0", 0), entries.get(0));
- entries = parser.getSettingEntries(config, file2, languageId);
+ entries = parser.getSettingEntries(cfgDescription, file2, languageId);
assertEquals(new CIncludePathEntry("/path0", 0), entries.get(0));
- entries = parser.getSettingEntries(config, file3, languageId);
+ entries = parser.getSettingEntries(cfgDescription, file3, languageId);
assertEquals(new CIncludePathEntry("/path0", 0), entries.get(0));
}

Back to the top