Extend o.e.e4.emf.xpath.test to cover test child context

Author: ptziegler

tests/org.eclipse.e4.emf.xpath.test/model/fragment.e4xmi

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_LyWmYOb0Ee--mt4bM5b6zQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_KlpGMOb1Ee--mt4bM5b6zQ" featurename="addons" parentElementId="xpath:/">
+    <elements xsi:type="application:Addon" xmi:id="_YfwQoOb1Ee--mt4bM5b6zQ" elementId="org.eclipse.e4.emf.xpath.test.addon.0"/>
+  </fragments>
+</fragment:ModelFragments>

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/ExampleQueriesApplicationTest.java

@@ -14,12 +14,16 @@
 package org.eclipse.e4.emf.xpath.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.util.List;
+
 import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
 import org.eclipse.e4.emf.xpath.XPathContext;
 import org.eclipse.e4.emf.xpath.XPathContextFactory;
 import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
+import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
 import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -28,6 +32,8 @@
 import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
 import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
 import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.model.fragment.MModelFragments;
+import org.eclipse.e4.ui.model.fragment.MStringModelFragment;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -41,11 +47,14 @@ public class ExampleQueriesApplicationTest {
 
 	private ResourceSet resourceSet;
 	private XPathContext xpathContext;
+	private XPathContext xpathChildContext;
 	private Resource resource;
+	private Resource childResource;
 
 	@SuppressWarnings("restriction")
 	@Before
 	public void setUp() {
+
 		resourceSet = new ResourceSetImpl();
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
 				.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new E4XMIResourceFactory());
@@ -63,13 +72,19 @@ public void setUp() {
 		resource = resourceSet.getResource(uri, true);
 		XPathContextFactory<EObject> f = EcoreXPathContextFactory.newInstance();
 		xpathContext = f.newContext(resource.getContents().get(0));
+		URI childUri = URI.createPlatformPluginURI("/org.eclipse.e4.emf.xpath.test/model/fragment.e4xmi", true);
+		childResource = resourceSet.getResource(childUri, true);
+		xpathChildContext = f.newContext(xpathContext, childResource.getContents().get(0));
 	}
 
 	@After
 	public void tearDown() {
 		xpathContext = null;
 		resource.unload();
 		resourceSet.getResources().remove(resource);
+		xpathChildContext = null;
+		childResource.unload();
+		resourceSet.getResources().remove(childResource);
 	}
 
 	@Test
@@ -80,17 +95,48 @@ public void testAccessingTheApplication() {
 
 	@Test
 	public void testAccessingTheMainMenu() {
-		Object menu = xpathContext.getValue("//mainMenu");
-		assertThat(menu).isInstanceOf(MMenu.class);
+		assertThat(xpathContext.getValue("//mainMenu")).isInstanceOf(MMenu.class);
+		assertNotNull(xpathContext.getValue("//mainMenu", MMenu.class));
 
-		MMenu mMenu = xpathContext.getValue("//mainMenu", MMenu.class);
-		assertNotNull(mMenu);
+		assertNotNull(xpathContext.getValue("/children/mainMenu", MMenu.class));
+		assertThat(xpathContext.getValue("/children/mainMenu")).isInstanceOf(MMenu.class);
 	}
 
 	@Test
 	public void testAccessingAllMenus() {
 		Object menuEntries = xpathContext.getValue("//mainMenu/children");
-		assertNotNull(menuEntries);
+		assertThat(menuEntries).isInstanceOf(List.class);
+		List<?> list = (List<?>) menuEntries;
+		assertEquals(2, list.size());
+		assertThat(list).allMatch(MMenu.class::isInstance, "Is instanceof of MMenu") //
+				.anyMatch(e -> "File".equals(((MMenu) e).getLabel()))
+				.anyMatch(e -> "Help".equals(((MMenu) e).getLabel()));
 	}
 
-}
+	@Test
+	public void testAccessingTheModelFragments() {
+		Object modelFragments = xpathChildContext.getValue("/");
+		assertThat(modelFragments).isInstanceOf(MModelFragments.class);
+	}
+
+	@Test
+	public void testAccessingTheStringModelFragment() {
+		Object modelFragment = xpathChildContext.getValue("//fragments[1]");
+		assertThat(modelFragment).isInstanceOf(MStringModelFragment.class);
+
+		MStringModelFragment mModelFragment = xpathChildContext.getValue("//fragments[1]", MStringModelFragment.class);
+		assertNotNull(mModelFragment);
+
+		Object modelFragment2 = xpathChildContext.getValue("/fragments[1]");
+		assertThat(modelFragment2).isInstanceOf(MStringModelFragment.class);
+	}
+
+	@Test
+	public void testAccessingTheAddons() {
+		Object addon = xpathChildContext.getValue("//elements[1]");
+		assertThat(addon).isInstanceOf(MAddon.class);
+
+		MAddon mAddon = xpathChildContext.getValue("//elements[1]", MAddon.class);
+		assertNotNull(mAddon);
+	}
+}