polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [76/81] [abbrv] zest-java git commit: Tightening everything up after massive namespace change. Removal of practically all "Qi4j" names and references.
Date Fri, 31 Jul 2015 02:59:56 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityTypeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityTypeTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityTypeTest.java
index 0ce87bc..2c15fdc 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityTypeTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityTypeTest.java
@@ -24,11 +24,11 @@ import org.apache.zest.api.entity.EntityComposite;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 public class EntityTypeTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Test
     public void givenSubclassedEntityWhenRequestingSuperclassExpectResolutionToWork()

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java
index 10e36df..77baf16 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java
@@ -40,7 +40,7 @@ import org.apache.zest.test.EntityTestAssembler;
 public class EntityVisibilityTest
 {
 
-    private Energy4Java qi4j;
+    private Energy4Java zest;
     private Module module;
     private Application app;
 
@@ -48,7 +48,7 @@ public class EntityVisibilityTest
     public void setup()
         throws Exception
     {
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -71,7 +71,7 @@ public class EntityVisibilityTest
                   }
                 }
             };
-        app = qi4j.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/LifecycleTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/LifecycleTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/LifecycleTest.java
index 26f34dd..495bff8 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/LifecycleTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/LifecycleTest.java
@@ -26,7 +26,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.assertThat;
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat;
  * Test for the Lifecycle interface
  */
 public class LifecycleTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public static boolean create;
     public static boolean remove;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/QI273Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/QI273Test.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/QI273Test.java
index 3fa65b9..51a7459 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/QI273Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/QI273Test.java
@@ -21,14 +21,14 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 /**
  * @author Stanislav Muhametsin
  */
 public class QI273Test
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public static interface RoleA

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/AssociationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/AssociationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/AssociationTest.java
index 81b2023..a1627d7 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/AssociationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/AssociationTest.java
@@ -27,14 +27,14 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 /**
  * Tests for associations
  */
 public class AssociationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/ImmutableAssociationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/ImmutableAssociationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/ImmutableAssociationTest.java
index b78b2af..3dd855b 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/ImmutableAssociationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/associations/ImmutableAssociationTest.java
@@ -24,14 +24,14 @@ import org.apache.zest.api.property.Immutable;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 /**
  * Test that associations can be marked as @Immutable
  */
 public class ImmutableAssociationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ActivatorInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ActivatorInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ActivatorInjectionTest.java
index 5099f18..9af6dd1 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ActivatorInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ActivatorInjectionTest.java
@@ -29,7 +29,7 @@ import org.apache.zest.api.structure.Layer;
 import org.apache.zest.api.structure.Module;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertThat;
  * Assert that injections on Activators works.
  */
 public class ActivatorInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Mixins( MixinA.class )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/IllegalUnitOfWorkInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/IllegalUnitOfWorkInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/IllegalUnitOfWorkInjectionTest.java
index 26cad5f..1165606 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/IllegalUnitOfWorkInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/IllegalUnitOfWorkInjectionTest.java
@@ -25,13 +25,13 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.fail;
 
 public class IllegalUnitOfWorkInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private boolean failed = false;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateInjectionTest.java
index 6453039..2c654d7 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateInjectionTest.java
@@ -24,7 +24,7 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.property.StateHolder;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat;
  * Test the @State annotation
  */
 public class StateInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateParameterInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateParameterInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateParameterInjectionTest.java
index 7bcf236..b69b313 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateParameterInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StateParameterInjectionTest.java
@@ -22,7 +22,7 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  * Test the @State annotation when used for parameters
  */
 public class StateParameterInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StructureInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StructureInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StructureInjectionTest.java
index 75ab263..80cc85e 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/StructureInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/StructureInjectionTest.java
@@ -15,7 +15,7 @@
 package org.apache.zest.runtime.injection;
 
 import org.junit.Test;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.composite.TransientBuilderFactory;
 import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.injection.scope.Structure;
@@ -26,8 +26,8 @@ import org.apache.zest.api.structure.Module;
 import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.spi.Qi4jSPI;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.spi.ZestSPI;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
  * Test the @Structure annotation
  */
 public class StructureInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException
@@ -46,7 +46,7 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a CompositeBuilderFactory annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a CompositeBuilderFactory annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForCompositeBuilderFactory()
@@ -56,7 +56,7 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a ObjectBuilderFactory annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a ObjectBuilderFactory annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForObjectBuilderFactory()
@@ -66,7 +66,7 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a UnitOfWorkFactory annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a UnitOfWorkFactory annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForUnitOfWorkFactory()
@@ -76,7 +76,7 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a ServiceLocator annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a ServiceLocator annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForServiceLocator()
@@ -86,7 +86,7 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a ModuleBinding annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a ModuleBinding annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForModuleBinding()
@@ -96,23 +96,23 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a Zest annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a Zest annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
-    public void injectedStructureForQi4j()
+    public void injectedStructureForZest()
     {
         StructureInjectionComposite sic = module.newTransient( StructureInjectionComposite.class );
-        assertThat( "Injected Zest", sic.getQi4j(), is( notNullValue() ) );
+        assertThat( "Injected Zest", sic.getZest(), is( notNullValue() ) );
     }
 
     /**
-     * Tests injected mixin for a Qi4jSpi annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a ZestSPI annotated with {@link @org.apache.zest.composite.scope.Structure}.
      */
     @Test
-    public void injectedStructureForQi4jSpi()
+    public void injectedStructureForZestSpi()
     {
         StructureInjectionComposite sic = module.newTransient( StructureInjectionComposite.class );
-        assertThat( "Injected Qi4jSpi", sic.getQi4jSpi(), is( notNullValue() ) );
+        assertThat( "Injected ZestSPI", sic.getZestSpi(), is( notNullValue() ) );
     }
 
     @Mixins( StructureInjectionMixin.class )
@@ -129,9 +129,9 @@ public class StructureInjectionTest
 
         public Module getModule();
 
-        public Qi4j getQi4j();
+        public ZestAPI getZest();
 
-        public Qi4jSPI getQi4jSpi();
+        public ZestSPI getZestSpi();
     }
 
     public abstract static class StructureInjectionMixin
@@ -153,9 +153,9 @@ public class StructureInjectionTest
         Module module;
 
         @Structure
-        Qi4j qi4j;
+        ZestAPI api;
         @Structure
-        Qi4jSPI qi4jSpi;
+        ZestSPI spi;
 
         public TransientBuilderFactory getCompositeBuilderFactory()
         {
@@ -182,14 +182,14 @@ public class StructureInjectionTest
             return module;
         }
 
-        public Qi4j getQi4j()
+        public ZestAPI getZest()
         {
-            return qi4j;
+            return api;
         }
 
-        public Qi4jSPI getQi4jSpi()
+        public ZestSPI getZestSpi()
         {
-            return qi4jSpi;
+            return spi;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
index 66c2e9f..7d071fd 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
@@ -25,7 +25,7 @@ import org.apache.zest.api.sideeffect.SideEffectOf;
 import org.apache.zest.api.sideeffect.SideEffects;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat;
  * Test the @This annotation
  */
 public class ThisInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public static boolean sideEffectInjected;
 
@@ -46,7 +46,7 @@ public class ThisInjectionTest
     }
 
     /**
-     * Tests the injected object for {@link @org.qi4j.composite.scope.This} annotation.
+     * Tests the injected object for {@link @org.apache.zest.composite.scope.This} annotation.
      *
      * @throws Exception re-thrown
      */

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UnitOfWorkInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UnitOfWorkInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UnitOfWorkInjectionTest.java
index 5d3774a..7c3d2f0 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UnitOfWorkInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UnitOfWorkInjectionTest.java
@@ -27,13 +27,13 @@ import org.apache.zest.api.usecase.Usecase;
 import org.apache.zest.api.usecase.UsecaseBuilder;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.assertEquals;
 
 public class UnitOfWorkInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericClassTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericClassTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericClassTest.java
index 4c959fb..fe37567 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericClassTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericClassTest.java
@@ -20,7 +20,7 @@ import org.apache.zest.api.injection.scope.Uses;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
  * Test of generic class injection
  */
 public class UsesGenericClassTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericListTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericListTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericListTest.java
index cc039c9..bf69ba0 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericListTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGenericListTest.java
@@ -27,13 +27,13 @@ import org.apache.zest.api.injection.scope.Uses;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 /**
  * Test of generic list injection
  */
 public class UsesGenericListTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGraphTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGraphTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGraphTest.java
index 772bddf..129f399 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGraphTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesGraphTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.apache.zest.api.injection.scope.Uses;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
@@ -28,7 +28,7 @@ import static org.hamcrest.CoreMatchers.not;
  * Test creation of object graph, where @Uses is used to refer to instances
  */
 public class UsesGraphTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesInjectionTest.java
index 9c256d0..19666b5 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/UsesInjectionTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 import org.apache.zest.api.injection.scope.Uses;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
  * Test the @Uses annotation
  */
 public class UsesInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/EagerServiceInstantiationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/EagerServiceInstantiationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/EagerServiceInstantiationTest.java
index 16b7aa0..04b04cb 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/EagerServiceInstantiationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/EagerServiceInstantiationTest.java
@@ -26,12 +26,12 @@ import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.api.service.ServiceDescriptor;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 
 public class EagerServiceInstantiationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private TestInfo testInfo;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ServiceInstantiationTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ServiceInstantiationTests.java b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ServiceInstantiationTests.java
index 599b29e..c34e1cd 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ServiceInstantiationTests.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ServiceInstantiationTests.java
@@ -26,11 +26,11 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 public class ServiceInstantiationTests
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/TransientInstantiationTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/TransientInstantiationTests.java b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/TransientInstantiationTests.java
index 55cff6c..bbb0197 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/TransientInstantiationTests.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/TransientInstantiationTests.java
@@ -24,10 +24,10 @@ import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 public class TransientInstantiationTests
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ValueInstantiationTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ValueInstantiationTests.java b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ValueInstantiationTests.java
index 116d33e..e2387b5 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ValueInstantiationTests.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/instantiation/ValueInstantiationTests.java
@@ -25,12 +25,12 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.fail;
 
 public class ValueInstantiationTests
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyMixinTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyMixinTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyMixinTest.java
index 2af8dcb..d00f655 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyMixinTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyMixinTest.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
  * Test of declaring mixin in assembly
  */
 public class AssemblyMixinTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyRoleTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyRoleTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyRoleTest.java
index e93c1d3..f8fb6a2 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyRoleTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/AssemblyRoleTest.java
@@ -22,7 +22,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  * Test of declaring types in assembly
  */
 public class AssemblyRoleTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InitializableTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InitializableTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InitializableTest.java
index cf1f11e..df58cfe 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InitializableTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InitializableTest.java
@@ -22,7 +22,7 @@ import org.apache.zest.api.mixin.InitializationException;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
  * Test of Initializable interface
  */
 public class InitializableTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InvokeServiceFromModuleAssemblyTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InvokeServiceFromModuleAssemblyTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InvokeServiceFromModuleAssemblyTest.java
index cfa57fb..449b788 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InvokeServiceFromModuleAssemblyTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/InvokeServiceFromModuleAssemblyTest.java
@@ -20,7 +20,7 @@ import org.apache.zest.api.mixin.NoopMixin;
 import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.fail;
 
@@ -28,7 +28,7 @@ import static org.junit.Assert.fail;
  * @author Stanislav Muhametsin
  */
 public class InvokeServiceFromModuleAssemblyTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Mixins( NoopMixin.class )
     public interface TestService

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/JDKMixinTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/JDKMixinTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/JDKMixinTest.java
index 502f4ca..ef7aae2 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/JDKMixinTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/JDKMixinTest.java
@@ -31,7 +31,7 @@ import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.functional.Specification;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.core.IsEqual.*;
 import static org.junit.Assert.*;
@@ -41,7 +41,7 @@ import static org.apache.zest.functional.Iterables.*;
  * Assert that JDK classes are usable as Mixins.
  */
 public class JDKMixinTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Concerns( JDKMixinConcern.class )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MethodInterceptionMixinTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MethodInterceptionMixinTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MethodInterceptionMixinTest.java
index eeb8a18..63aad6e 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MethodInterceptionMixinTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MethodInterceptionMixinTest.java
@@ -30,12 +30,12 @@ import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 
 public class MethodInterceptionMixinTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinPrecedenceTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinPrecedenceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinPrecedenceTest.java
index 7d9aad8..609e14a 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinPrecedenceTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinPrecedenceTest.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
  * Test mixin declaration precedence satisfiedBy
  */
 public class MixinPrecedenceTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinsOnThisInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinsOnThisInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinsOnThisInjectionTest.java
index 15b75ee..8a77bca 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinsOnThisInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/MixinsOnThisInjectionTest.java
@@ -19,7 +19,7 @@ import org.apache.zest.api.injection.scope.This;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
  * Test of declaring Mixin in @This declared interface
  */
 public class MixinsOnThisInjectionTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/PrivateMixinTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/PrivateMixinTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/PrivateMixinTest.java
index 3c27c5f..9ed5207 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/PrivateMixinTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/PrivateMixinTest.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.injection.scope.This;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
  * Unit tests related to private mixins.
  */
 public class PrivateMixinTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/Qi228Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/Qi228Test.java b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/Qi228Test.java
index 972a989..00fd3fc 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/mixin/Qi228Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/mixin/Qi228Test.java
@@ -26,10 +26,10 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 public class Qi228Test
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java
index d7a7779..22a733b 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java
@@ -40,7 +40,7 @@ import org.apache.zest.test.EntityTestAssembler;
 public class ObjectVisibilityTest
 {
 
-    private Energy4Java qi4j;
+    private Energy4Java zest;
     private Module module;
     private Application app;
 
@@ -48,7 +48,7 @@ public class ObjectVisibilityTest
     public void setup()
         throws Exception
     {
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -71,7 +71,7 @@ public class ObjectVisibilityTest
                   }
                 }
             };
-        app = qi4j.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/property/ImmutablePropertyTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/property/ImmutablePropertyTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/property/ImmutablePropertyTest.java
index a6b2fc1..caed693 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/property/ImmutablePropertyTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/property/ImmutablePropertyTest.java
@@ -27,14 +27,14 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public final class ImmutablePropertyTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private static final String KUALA_LUMPUR = "Kuala Lumpur";
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyEqualityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyEqualityTest.java
index 92e17f4..0daf7b8 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyEqualityTest.java
@@ -31,7 +31,7 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueDescriptor;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertThat;
  * Assert that Property equals/hashcode methods combine PropertyDescriptor and State.
  */
 public class PropertyEqualityTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     //
@@ -124,11 +124,11 @@ public class PropertyEqualityTest
     public void givenValuesOfTheSameTypeWhenTestingPropertyDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         Some other = buildSomeValue( module );
-        ValueDescriptor otherDescriptor = qi4j.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
         PropertyDescriptor otherCharPropDesc = otherDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         assertThat( "PropertyDescriptors equal",
@@ -143,11 +143,11 @@ public class PropertyEqualityTest
     public void givenValuesOfCommonTypesWhenTestingPropertyDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         PrimitivesValue primitive = buildPrimitivesValue( module );
-        ValueDescriptor primitiveDescriptor = qi4j.api().valueDescriptorFor( primitive );
+        ValueDescriptor primitiveDescriptor = zest.api().valueDescriptorFor( primitive );
         PropertyDescriptor primitiveCharPropDesc = primitiveDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         assertThat( "PropertyDescriptors equal",
@@ -162,11 +162,11 @@ public class PropertyEqualityTest
     public void givenValuesOfDifferentTypesWhenTestingPropertyDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         Other other = buildOtherValue( module );
-        ValueDescriptor otherDescriptor = qi4j.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
         PropertyDescriptor otherCharPropDesc = otherDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         assertThat( "PropertyDescriptors not equal",

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyStringArrayTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyStringArrayTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyStringArrayTest.java
index d90dd5c..a2c65d0 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyStringArrayTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyStringArrayTest.java
@@ -20,7 +20,7 @@ import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
  * Tests for string arrays as properties (QI-132)
  */
 public class PropertyStringArrayTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyTest.java
index b11a952..13ac188 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/property/PropertyTest.java
@@ -27,7 +27,7 @@ import org.apache.zest.api.property.PropertyMixin;
 import org.apache.zest.api.property.PropertyWrapper;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 //    "This is an incorrect satisfiedBy case. The Property fragment support is not well defined at the moment, so until" +
 //    "more work is finalized on exactly what should be supported, this is ignored not to be forgotten." )
 public class PropertyTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/property/ValueNestedBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/property/ValueNestedBuilderTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/property/ValueNestedBuilderTest.java
index 2b70db8..1f51610 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/property/ValueNestedBuilderTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/property/ValueNestedBuilderTest.java
@@ -24,10 +24,10 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 public class ValueNestedBuilderTest
-        extends AbstractQi4jTest
+        extends AbstractZestTest
 {
 
     static interface InnerValue

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/query/NonQueryableTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/query/NonQueryableTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/query/NonQueryableTest.java
index 251fc89..b876242 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/query/NonQueryableTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/query/NonQueryableTest.java
@@ -26,13 +26,13 @@ import org.apache.zest.api.query.QueryException;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.apache.zest.api.query.QueryExpressions.eq;
 import static org.apache.zest.api.query.QueryExpressions.templateFor;
 
 public class NonQueryableTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/query/QueryBuilderFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/query/QueryBuilderFactoryImplTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/query/QueryBuilderFactoryImplTest.java
index a2d2d51..f91b424 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/query/QueryBuilderFactoryImplTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/query/QueryBuilderFactoryImplTest.java
@@ -26,7 +26,7 @@ import org.apache.zest.api.query.Query;
 import org.apache.zest.api.query.QueryBuilder;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -41,7 +41,7 @@ import static org.apache.zest.api.query.QueryExpressions.templateFor;
  * JAVADOC
  */
 public class QueryBuilderFactoryImplTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private List<TestComposite> composites;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/service/ComplexActivatableTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/ComplexActivatableTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/ComplexActivatableTest.java
index bb89b7f..3e9eb97 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/service/ComplexActivatableTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/ComplexActivatableTest.java
@@ -26,12 +26,12 @@ import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 
 public class ComplexActivatableTest
-        extends AbstractQi4jTest
+        extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/service/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/ConfigurationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/ConfigurationTest.java
index 1d75000..e5b947b 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/service/ConfigurationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/ConfigurationTest.java
@@ -28,7 +28,7 @@ import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertThat;
  * Test of configuration for services
  */
 public class ConfigurationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Service
     ServiceReference<HelloWorldService> service;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceFinderTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceFinderTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceFinderTest.java
index 5ddfa84..55998b0 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceFinderTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceFinderTest.java
@@ -21,13 +21,13 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertThat;
 
-public class ServiceFinderTest extends AbstractQi4jTest
+public class ServiceFinderTest extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java
index 4bf3f54..e1d9ae6 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java
@@ -39,7 +39,7 @@ import org.apache.zest.test.EntityTestAssembler;
 
 public class ServiceVisibilityTest
 {
-    private Energy4Java qi4j;
+    private Energy4Java zest;
     private Module module;
     private Application app;
 
@@ -47,7 +47,7 @@ public class ServiceVisibilityTest
     public void setup()
         throws Exception
     {
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -70,7 +70,7 @@ public class ServiceVisibilityTest
                   }
                 }
             };
-        app = qi4j.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/GenericSideEffectTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/GenericSideEffectTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/GenericSideEffectTest.java
index 1ef3c32..2a8e97a 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/GenericSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/GenericSideEffectTest.java
@@ -27,7 +27,7 @@ import org.apache.zest.api.sideeffect.GenericSideEffect;
 import org.apache.zest.api.sideeffect.SideEffects;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
  * JAVADOC
  */
 public class GenericSideEffectTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/ModuleSideEffectTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/ModuleSideEffectTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/ModuleSideEffectTest.java
index 57e1424..e2246db 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/ModuleSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/ModuleSideEffectTest.java
@@ -24,13 +24,13 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.sideeffect.GenericSideEffect;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 /**
  * Test of declaring sideeffect in assembly
  */
 public class ModuleSideEffectTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public static boolean ok = false;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SampleTransientTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SampleTransientTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SampleTransientTest.java
index 76b144e..1618de4 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SampleTransientTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SampleTransientTest.java
@@ -25,12 +25,12 @@ import org.apache.zest.api.sideeffect.SideEffectOf;
 import org.apache.zest.api.sideeffect.SideEffects;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 
-public class SampleTransientTest extends AbstractQi4jTest
+public class SampleTransientTest extends AbstractZestTest
 {
 
     @Structure

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SpecificSideEffectTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SpecificSideEffectTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SpecificSideEffectTest.java
index 6de1184..6c909f3 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SpecificSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/sideeffects/SpecificSideEffectTest.java
@@ -24,7 +24,7 @@ import org.apache.zest.api.sideeffect.SideEffectOf;
 import org.apache.zest.api.sideeffect.SideEffects;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat;
  * Test for adding side-effects to methods specified by domain interfaces
  */
 public class SpecificSideEffectTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/structure/ApplicationModeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/structure/ApplicationModeTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/structure/ApplicationModeTest.java
index 38f1743..5e7bd5d 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/structure/ApplicationModeTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/structure/ApplicationModeTest.java
@@ -23,10 +23,10 @@ import org.apache.zest.api.structure.Application;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.bootstrap.SingletonAssembler;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 public class ApplicationModeTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException
@@ -37,7 +37,7 @@ public class ApplicationModeTest
     @Test
     public void testApplicationModeNotSet()
     {
-        // mode is set to test in AbstractQi4jTest
+        // mode is set to test in AbstractZestTest
         Assert.assertThat( "mode set to default",
                            application.mode(),
                            CoreMatchers.equalTo( Application.Mode.test ) );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
index 7edc497..58a42d4 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.composite.TransientDescriptor;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
 import static org.apache.zest.functional.Iterables.first;
 
 public class CompositeDescriptorTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Test
     public final void testCompositeDescriptorWithComposite()

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/threaded/ContextCompositeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/threaded/ContextCompositeTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/threaded/ContextCompositeTest.java
index 255220b..2869f45 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/threaded/ContextCompositeTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/threaded/ContextCompositeTest.java
@@ -25,12 +25,12 @@ import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 
 public class ContextCompositeTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Test

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java
index 2afe76e..798830c 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java
@@ -40,7 +40,7 @@ import org.apache.zest.test.EntityTestAssembler;
 
 public class TransientVisibilityTest
 {
-    private Energy4Java qi4j;
+    private Energy4Java zest;
     private Module module;
     private Application app;
 
@@ -48,7 +48,7 @@ public class TransientVisibilityTest
     public void setup()
         throws Exception
     {
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -71,7 +71,7 @@ public class TransientVisibilityTest
                   }
                 }
             };
-        app = qi4j.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/AutoCloseableUoWTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/AutoCloseableUoWTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/AutoCloseableUoWTest.java
index c7e0e99..82439f3 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/AutoCloseableUoWTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/AutoCloseableUoWTest.java
@@ -22,7 +22,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  * Assert that Automatic Resource Management (ie. Java 7 try-with-resources) work on UoWs.
  */
 public class AutoCloseableUoWTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public interface TestEntity

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java
index 2a48315..86e2fba 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java
@@ -55,7 +55,7 @@ public class PrivateEntityUnitOfWorkTest
     public void givenAppWithPrivateEntityWhenUnitOfWorkCanSeeItThenCanCommit()
         throws Exception
     {
-        System.setProperty( "qi4j.compacttrace", "off" );
+        System.setProperty( "zest.compacttrace", "off" );
 
         Energy4Java is = new Energy4Java();
         Application app = is.newApplication( new ApplicationAssembler()

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/RemovalTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/RemovalTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/RemovalTest.java
index a486d0e..d80267c 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/RemovalTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/RemovalTest.java
@@ -26,14 +26,14 @@ import org.apache.zest.api.unitofwork.NoSuchEntityException;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class RemovalTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/UnitOfWorkFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/UnitOfWorkFactoryTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/UnitOfWorkFactoryTest.java
index 8c1fd58..e084471 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/UnitOfWorkFactoryTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/UnitOfWorkFactoryTest.java
@@ -28,11 +28,11 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 public class UnitOfWorkFactoryTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/NestedValueBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/NestedValueBuilderTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/NestedValueBuilderTest.java
index 54a4028..dfcab7c 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/NestedValueBuilderTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/NestedValueBuilderTest.java
@@ -24,12 +24,12 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.fail;
 
 public class NestedValueBuilderTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     static interface InnerValue

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueCompositeBasicsTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueCompositeBasicsTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueCompositeBasicsTest.java
index 96d680e..97de116 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueCompositeBasicsTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueCompositeBasicsTest.java
@@ -25,13 +25,13 @@ import org.apache.zest.api.property.Property;
 import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 public class ValueCompositeBasicsTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueEqualityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueEqualityTest.java
index ecea53b..aaa8662 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueEqualityTest.java
@@ -26,7 +26,7 @@ import org.apache.zest.runtime.property.PropertyEqualityTest.AnotherSome;
 import org.apache.zest.runtime.property.PropertyEqualityTest.Other;
 import org.apache.zest.runtime.property.PropertyEqualityTest.PrimitivesValue;
 import org.apache.zest.runtime.property.PropertyEqualityTest.Some;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
@@ -42,7 +42,7 @@ import static org.apache.zest.runtime.property.PropertyEqualityTest.buildSomeVal
  * Assert that Value equals/hashcode methods combine ValueDescriptor and ValueState.
  */
 public class ValueEqualityTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     //
@@ -62,10 +62,10 @@ public class ValueEqualityTest
     public void givenValuesOfTheSameTypeWhenTestingValueDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
 
         Some other = buildSomeValue( module );
-        ValueDescriptor otherDescriptor = qi4j.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
 
         assertThat( "ValueDescriptors equal",
                     someDescriptor,
@@ -79,10 +79,10 @@ public class ValueEqualityTest
     public void givenValuesOfCommonTypesWhenTestingValueDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
 
         PrimitivesValue primitive = buildPrimitivesValue( module );
-        ValueDescriptor primitiveDescriptor = qi4j.api().valueDescriptorFor( primitive );
+        ValueDescriptor primitiveDescriptor = zest.api().valueDescriptorFor( primitive );
 
         assertThat( "ValueDescriptors not equal",
                     someDescriptor,
@@ -96,10 +96,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesWhenTestingValueDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( module );
-        ValueDescriptor someDescriptor = qi4j.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
 
         Other other = buildOtherValue( module );
-        ValueDescriptor otherDescriptor = qi4j.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
 
         assertThat( "ValueDescriptors not equal",
                     someDescriptor,
@@ -116,10 +116,10 @@ public class ValueEqualityTest
     public void givenValuesOfSameTypesAndSameStateWhenTestingValueStateEqualityExpectEquals()
     {
         Some some = buildSomeValue( module );
-        AssociationStateHolder someState = qi4j.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
 
         Some some2 = buildSomeValue( module );
-        AssociationStateHolder some2State = qi4j.spi().stateOf( (ValueComposite) some2 );
+        AssociationStateHolder some2State = zest.spi().stateOf( (ValueComposite) some2 );
 
         assertThat( "ValueStates equal",
                     someState,
@@ -133,10 +133,10 @@ public class ValueEqualityTest
     public void givenValuesOfSameTypesAndDifferentStateWhenTestingValueStateEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( module );
-        AssociationStateHolder someState = qi4j.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
 
         Some some2 = buildSomeValueWithDifferentState( module );
-        AssociationStateHolder some2State = qi4j.spi().stateOf( (ValueComposite) some2 );
+        AssociationStateHolder some2State = zest.spi().stateOf( (ValueComposite) some2 );
 
         assertThat( "ValueStates not equal",
                     someState,
@@ -150,10 +150,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesAndSameStateWhenTestingValueStateEqualityExpectEquals()
     {
         Some some = buildSomeValue( module );
-        AssociationStateHolder someState = qi4j.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
 
         AnotherSome anotherSome = buildAnotherSomeValue( module );
-        AssociationStateHolder anotherSomeState = qi4j.spi().stateOf( (ValueComposite) anotherSome );
+        AssociationStateHolder anotherSomeState = zest.spi().stateOf( (ValueComposite) anotherSome );
 
         assertThat( "ValueStates equal",
                     someState,
@@ -167,10 +167,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesAndDifferentStateWhenTestingValueStateEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( module );
-        AssociationStateHolder someState = qi4j.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
 
         AnotherSome anotherSome = buildAnotherSomeValueWithDifferentState( module );
-        AssociationStateHolder anotherSomeState = qi4j.spi().stateOf( (ValueComposite) anotherSome );
+        AssociationStateHolder anotherSomeState = zest.spi().stateOf( (ValueComposite) anotherSome );
 
         assertThat( "ValueStates not equal",
                     someState,

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueInjectionDeserializationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueInjectionDeserializationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueInjectionDeserializationTest.java
index 33a8e16..fb98815 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueInjectionDeserializationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueInjectionDeserializationTest.java
@@ -33,11 +33,11 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueComposite;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 public class ValueInjectionDeserializationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
index 67daa26..c62423b 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueSerializationRegressionTest.java
@@ -31,10 +31,10 @@ import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
 import org.apache.zest.spi.uuid.UuidIdentityGeneratorService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
 
-public class ValueSerializationRegressionTest extends AbstractQi4jTest
+public class ValueSerializationRegressionTest extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java
index 6993720..4c4cdba 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java
@@ -41,7 +41,7 @@ import org.apache.zest.test.EntityTestAssembler;
 public class ValueVisibilityTest
 {
 
-    private Energy4Java qi4j;
+    private Energy4Java zest;
     private Module module;
     private Application app;
 
@@ -49,7 +49,7 @@ public class ValueVisibilityTest
     public void setup()
         throws Exception
     {
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -72,7 +72,7 @@ public class ValueVisibilityTest
                   }
                 }
             };
-        app = qi4j.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();


Mime
View raw message