From c31c45f8094cfeeaba61d797b39374d2946f3273 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 11 Apr 2019 15:08:29 +0300 Subject: [PATCH] xinclude support for stubbed dom: test model property instead of associated psi --- .../util/xml/stubs/DomStubBuilderTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java index a8ab8c7712a8..5944a2dd6d12 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java @@ -107,6 +107,11 @@ public class DomStubBuilderTest extends DomStubTest { } public void testInclusion() { + doInclusionTest(true); + doInclusionTest(false); + } + + private void doInclusionTest(boolean onStubs) { myFixture.copyFileToProject("include.xml"); doBuilderTest("inclusion.xml", "File:foo\n" + " Element:foo\n" + @@ -117,14 +122,17 @@ public class DomStubBuilderTest extends DomStubTest { " Element:bar\n"); PsiFile file = myFixture.getFile(); - GCWatcher.tracking(file.getNode()).tryGc(); - assertFalse(((PsiFileImpl) file).isContentsLoaded()); + if (onStubs) { + GCWatcher.tracking(file.getNode()).tryGc(); + } + assertEquals(!onStubs, ((PsiFileImpl) file).isContentsLoaded()); DomFileElement element = DomManager.getDomManager(getProject()).getFileElement((XmlFile)file, Foo.class); assert element != null; List bars = element.getRootElement().getBars(); assertEquals(3, bars.size()); - assertEquals("include.xml", bars.get(0).getXmlTag().getContainingFile().getName()); + assertEquals("included", bars.get(0).getString().getValue()); +// assertEquals("inclusion.xml", bar.getXmlTag().getContainingFile().getName()); } public static class TestExtender extends DomExtender {