mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 579669: Ignore .settings in some tests

Browse source 
In Eclipse 4.24 .settings is created all the time for new projects,
for CDT test projects which have the root of the project being the source
root this means that .settings is now returned in various places.

This patch removes .settings from results before checking results against
expected results.

Change-Id: Id02e9b8f25b109ed289d22ffb526ecceb747d4f7
This commit is contained in:
Jonah Graham 2022-04-12 14:15:00 -04:00
parent e954ff6fe1
commit 2402a0101e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
View file

@ -295,12 +295,18 @@ public class CModelTests extends TestCase {
testProject.accept(new ICElementVisitor() { testProject.accept(new ICElementVisitor() {
@Override @Override
public boolean visit(ICElement element) throws CoreException { public boolean visit(ICElement element) throws CoreException {
if (".settings".equals(element.getElementName())) {
return false;
}
actual.add("visit " + element.getResource().getName()); actual.add("visit " + element.getResource().getName());
return true; return true;
} }
@Override @Override
public void leave(ICElement element) throws CoreException { public void leave(ICElement element) throws CoreException {
if (".settings".equals(element.getElementName())) {
return;
}
actual.add("leave " + element.getResource().getName()); actual.add("leave " + element.getResource().getName());
} }
}); });
@ -335,6 +341,7 @@ public class CModelTests extends TestCase {
ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0); ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0);
List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER); List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
assertEquals(1, cContainers.size()); assertEquals(1, cContainers.size());
assertEquals("test", cContainers.get(0).getElementName()); assertEquals("test", cContainers.get(0).getElementName());
@ -373,6 +380,7 @@ public class CModelTests extends TestCase {
sourceRoot = (ISourceRoot) cSourceRoots.get(0); sourceRoot = (ISourceRoot) cSourceRoots.get(0);
cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER); cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
assertEquals(1, cContainers.size()); assertEquals(1, cContainers.size());
assertEquals("test", cContainers.get(0).getElementName()); assertEquals("test", cContainers.get(0).getElementName());
@ -421,6 +429,7 @@ public class CModelTests extends TestCase {
ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0); ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0);
List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER); List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
assertEquals(1, cContainers.size()); assertEquals(1, cContainers.size());
assertEquals(subFolder.getName(), cContainers.get(0).getElementName()); assertEquals(subFolder.getName(), cContainers.get(0).getElementName());
@ -456,6 +465,7 @@ public class CModelTests extends TestCase {
sourceRoot = (ISourceRoot) cSourceRoots.get(0); sourceRoot = (ISourceRoot) cSourceRoots.get(0);
cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER); cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
assertEquals(1, cContainers.size()); assertEquals(1, cContainers.size());
assertEquals(subFolder.getName(), cContainers.get(0).getElementName()); assertEquals(subFolder.getName(), cContainers.get(0).getElementName());

4
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
View file

@ -182,7 +182,9 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
ContentAssistResult r = invokeContentAssist(offset, length, isCompletion, isTemplate, filterResults); ContentAssistResult r = invokeContentAssist(offset, length, isCompletion, isTemplate, filterResults);
String[] resultStrings = toStringArray(r.results, compareType); List<String> resultStringList = new ArrayList<>(Arrays.asList(toStringArray(r.results, compareType)));
resultStringList.removeIf(string -> string != null && string.contains(".settings"));
String[] resultStrings = resultStringList.toArray(String[]::new);
if (!checkOrder) { if (!checkOrder) {
Arrays.sort(expected); Arrays.sort(expected);
Arrays.sort(resultStrings); Arrays.sort(resultStrings);