Bug 292766 - [context] Make context control methods easier to use

3 files changed, 7 insertions, 7 deletions

diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ComplexDisposalTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ComplexDisposalTest.java
index fcbde48..816f3b4 100644
--- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ComplexDisposalTest.java
+++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ComplexDisposalTest.java
@@ -55,7 +55,7 @@ public class ComplexDisposalTest extends TestCase {
 		IEclipseContext parentContext = EclipseContextFactory.create();
 		parentContext.set("aString", "");
 		parentContext.set(Test.class.getName(), new TestFunction());
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 
 		Test test = (Test) context.get(Test.class.getName());
 
@@ -69,7 +69,7 @@ public class ComplexDisposalTest extends TestCase {
 	public void testV() throws Exception {
 		IEclipseContext parentContext = EclipseContextFactory.create();
 		parentContext.set("aString", "");
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 
 		Test test = (Test) ContextInjectionFactory.make(Test.class, context);
 
@@ -83,7 +83,7 @@ public class ComplexDisposalTest extends TestCase {
 	public void testW() throws Exception {
 		IEclipseContext parentContext = EclipseContextFactory.create();
 		parentContext.set("aString", "");
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 
 		Test test = new Test();
 		ContextInjectionFactory.inject(test, context);
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ParentContextDisposalTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ParentContextDisposalTest.java
index 695c00a..eda5e96 100644
--- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ParentContextDisposalTest.java
+++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ParentContextDisposalTest.java
@@ -44,7 +44,7 @@ public class ParentContextDisposalTest extends TestCase {
 
 	public void testParentContextDisposal() {
 		IEclipseContext context = EclipseContextFactory.create();
-		IEclipseContext child = EclipseContextFactory.create(context, null);
+		IEclipseContext child = context.createChild();
 		child.set("o", new Object());
 
 		Target target = (Target) ContextInjectionFactory.make(Target.class, child);
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/DisposeClassLinkTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/DisposeClassLinkTest.java
index fd54788..b052ea0 100644
--- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/DisposeClassLinkTest.java
+++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/DisposeClassLinkTest.java
@@ -74,7 +74,7 @@ public class DisposeClassLinkTest extends TestCase {
 
 	public void testDisposeParent() throws Exception {
 		IEclipseContext parentContext = EclipseContextFactory.create();
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 		Test test = (Test) ContextInjectionFactory.make(Test.class, context);
 
 		assertEquals(0, test.getCount());
@@ -86,7 +86,7 @@ public class DisposeClassLinkTest extends TestCase {
 
 	public void testInject() throws Exception {
 		IEclipseContext parentContext = EclipseContextFactory.create();
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 		Test test = new Test();
 		ContextInjectionFactory.inject(test, context);
 
@@ -97,7 +97,7 @@ public class DisposeClassLinkTest extends TestCase {
 
 	public void testDisposeParentFirst() throws Exception {
 		IEclipseContext parentContext = EclipseContextFactory.create();
-		IEclipseContext context = EclipseContextFactory.create(parentContext, null);
+		IEclipseContext context = parentContext.createChild();
 		Test test = new Test();
 		ContextInjectionFactory.inject(test, context);