Author: rombert
Date: Tue Sep 29 21:58:08 2015
New Revision: 1705934
URL: http://svn.apache.org/viewvc?rev=1705934&view=rev
Log:
SLING-4988 - Not all folders are displayed in Project Explorer
Simplify test setup in JcrContentContentProviderTest
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java?rev=1705934&r1=1705933&r2=1705934&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
Tue Sep 29 21:58:08 2015
@@ -32,6 +32,7 @@ import org.apache.sling.ide.util.PathUti
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -43,17 +44,23 @@ public class JcrContentContentProviderTe
@Rule
public DisableDebugStatusHandlers disableDebugHandlers = new
DisableDebugStatusHandlers();
- @Test
- public void listChildrenInNestedStructure() throws Exception {
-
- // create faceted project
- IProject contentProject = projectRule.getProject();
+ private IProject contentProject;
+ private ProjectAdapter project;
+
+ @Before
+ public void prepareProject() throws Exception {
+
+ contentProject = projectRule.getProject();
- ProjectAdapter project = new ProjectAdapter(contentProject);
+ project = new ProjectAdapter(contentProject);
project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
// install content facet
project.installFacet("sling.content", "1.0");
+ }
+
+ @Test
+ public void listChildrenInNestedStructure() throws Exception {
// create .content.xml structure
InputStream contentXml =
getClass().getResourceAsStream("content-nested-structure.xml");
@@ -71,15 +78,6 @@ public class JcrContentContentProviderTe
@Test
public void listChildrenWithNestedContentXmlInEscapedDir() throws
Exception {
- // create faceted project
- IProject contentProject = projectRule.getProject();
-
- ProjectAdapter project = new ProjectAdapter(contentProject);
- project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
-
- // install content facet
- project.installFacet("sling.content", "1.0");
-
// create .content.xml structure
project.createOrUpdateFile(Path.fromPortableString("jcr_root/content/.content.xml"),
getClass()
.getResourceAsStream("sling-folder-nodetype.xml"));
@@ -96,14 +94,6 @@ public class JcrContentContentProviderTe
@Test
public void listChildrenWhenContentXmlIsBroken() throws Exception {
- // create faceted project
- IProject contentProject = projectRule.getProject();
-
- ProjectAdapter project = new ProjectAdapter(contentProject);
- project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
-
- // install content facet
- project.installFacet("sling.content", "1.0");
// create .content.xml structure
project.createOrUpdateFile(Path.fromPortableString("jcr_root/content/.content.xml"),
new ByteArrayInputStream(
@@ -124,15 +114,6 @@ public class JcrContentContentProviderTe
@Test
public void listChildrenOnNtFolderIncludedUnderJcrContentNode() throws
Exception {
-
- // create faceted project
- IProject contentProject = projectRule.getProject();
-
- ProjectAdapter project = new ProjectAdapter(contentProject);
- project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
-
- // install content facet
- project.installFacet("sling.content", "1.0");
// create .content.xml structure
project.createOrUpdateFile(Path.fromPortableString("jcr_root/content/.content.xml"),
