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 for testDescription test. The test previously tried to set some includes on all setting entries on the root folder. In bug 229085 / 100844 libs are now contributed back as a LIRARY_FILE setting entry. Assert that storing includes in libs entry doesn't persist.

Browse source
This commit is contained in:
James Blackburn 2009-11-10 22:40:01 +00:00
parent dcd0c58abf
commit 934fb1975d
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java
View file

@ -327,6 +327,8 @@ public class ProjectModelTests extends TestCase implements IElementChangedListen
for(int i = 0; i < settings.length; i++){ for(int i = 0; i < settings.length; i++){
ICLanguageSetting setting = settings[i]; ICLanguageSetting setting = settings[i];
ICLanguageSettingEntry[] entries = setting.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH); ICLanguageSettingEntry[] entries = setting.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH);
if (!setting.supportsEntryKind(ICSettingEntry.INCLUDE_PATH))
assertTrue(entries.length == 0);
for(int j = 0; j < entries.length; j++){ for(int j = 0; j < entries.length; j++){
System.out.println(entries[j].getName()); System.out.println(entries[j].getName());
} }
@ -403,18 +405,13 @@ public class ProjectModelTests extends TestCase implements IElementChangedListen
for(int i = 0; i < settings.length; i++){ for(int i = 0; i < settings.length; i++){
ICLanguageSetting setting = settings[i]; ICLanguageSetting setting = settings[i];
ICLanguageSettingEntry[] entries = setting.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH); ICLanguageSettingEntry[] entries = setting.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH);
BuildSystemTestHelper.checkDiff(entries, updatedEntries); if (setting.supportsEntryKind(ICSettingEntry.INCLUDE_PATH)) {
if(entries.length > 0){ BuildSystemTestHelper.checkDiff(entries, updatedEntries);
// ICLanguageSettingEntry updated[] = new ICLanguageSettingEntry[entries.length + 1];
// System.arraycopy(entries, 0, updated, 1, entries.length);
// updated[0] = new CIncludePathEntry("a/b/c", 0);
// setting.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, updated);
// updatedEntries = setting.getSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH);
assertEquals(entries.length, updatedEntries.length); assertEquals(entries.length, updatedEntries.length);
for(int k = 0; k < entries.length; k++){ for(int k = 0; k < entries.length; k++)
assertEquals(entries[i].getValue(), updatedEntries[i].getValue()); assertEquals(entries[i].getValue(), updatedEntries[i].getValue());
} } else
} assertTrue(entries.length == 0);
} }
assertEquals(2, cfgDess.length); assertEquals(2, cfgDess.length);