polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [77/80] zest-java git commit: Tightening everything up after massive namespace change. Removal of practically all "Qi4j" names and references.
Date Thu, 30 Jul 2015 19:49:16 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientClassLoader.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientClassLoader.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientClassLoader.java
index fc38920..924ecb7 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientClassLoader.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientClassLoader.java
@@ -165,7 +165,7 @@ import static org.apache.zest.api.util.Classes.interfacesOf;
 
         // Composite reference
         {
-            fv = cw.visitField( ACC_PUBLIC, "_instance", "Lorg/qi4j/api/composite/CompositeInvoker;", null, null );
+            fv = cw.visitField( ACC_PUBLIC, "_instance", "Lorg/apache/zest/api/composite/CompositeInvoker;", null, null );
             fv.visitEnd();
         }
 
@@ -222,7 +222,7 @@ import static org.apache.zest.api.util.Classes.interfacesOf;
                 String[] exceptions = null;
                 {
                     mv = cw.visitMethod( ACC_PUBLIC, methodName, desc, null, exceptions );
-                    if( isInternalQi4jMethod( method, baseClass ) )
+                    if( isInternalZestMethod( method, baseClass ) )
                     {
                         // generate a NoOp method...
                         mv.visitInsn( RETURN );
@@ -259,7 +259,7 @@ import static org.apache.zest.api.util.Classes.interfacesOf;
                         mv.visitLabel( l0 );
                         mv.visitVarInsn( ALOAD, 0 );
                         mv.visitFieldInsn( GETFIELD, classSlash, "_instance",
-                                           "Lorg/qi4j/api/composite/CompositeInvoker;" );
+                                           "Lorg/apache/zest/api/composite/CompositeInvoker;" );
                         mv.visitFieldInsn( GETSTATIC, classSlash, "m" + idx, "Ljava/lang/reflect/Method;" );
 
                         int paramCount = method.getParameterTypes().length;
@@ -284,7 +284,7 @@ import static org.apache.zest.api.util.Classes.interfacesOf;
                         }
 
                         // Call method
-                        mv.visitMethodInsn( INVOKEINTERFACE, "org/qi4j/api/composite/CompositeInvoker",
+                        mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/api/composite/CompositeInvoker",
                                             "invokeComposite",
                                             "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
 
@@ -449,7 +449,7 @@ import static org.apache.zest.api.util.Classes.interfacesOf;
         }
     }
 
-    private static boolean isInternalQi4jMethod( Method method, Class baseClass )
+    private static boolean isInternalZestMethod( Method method, Class baseClass )
     {
         return isDeclaredIn( method, Initializable.class, baseClass )
                || isDeclaredIn( method, Lifecycle.class, baseClass );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientInstance.java
index 9d70a62..3a92397 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/TransientInstance.java
@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.composite.CompositeInstance;
 import org.apache.zest.api.property.StateHolder;
@@ -150,7 +150,7 @@ public class TransientInstance
         {
             return false;
         }
-        TransientInstance other = (TransientInstance) Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( (Composite) o );
+        TransientInstance other = (TransientInstance) ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( (Composite) o );
         if( other.mixins.length != mixins.length )
         {
             return false;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/StructureInjectionProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/StructureInjectionProviderFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/StructureInjectionProviderFactory.java
index 7ee3db0..ad05b64 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/StructureInjectionProviderFactory.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/StructureInjectionProviderFactory.java
@@ -18,7 +18,7 @@
 package org.apache.zest.runtime.injection.provider;
 
 import java.lang.reflect.Type;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.composite.TransientBuilderFactory;
 import org.apache.zest.api.object.ObjectFactory;
 import org.apache.zest.api.query.QueryBuilderFactory;
@@ -107,7 +107,7 @@ public final class StructureInjectionProviderFactory
             {
                 return (( ModuleInstance) context.module()).layerInstance().applicationInstance();
             }
-            else if( Qi4j.class.isAssignableFrom( clazz ) )
+            else if( ZestAPI.class.isAssignableFrom( clazz ) )
             {
                 return (( ModuleInstance) context.module()).layerInstance().applicationInstance().runtime();
             }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/internal/Activator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/internal/Activator.java b/core/runtime/src/main/java/org/apache/zest/runtime/internal/Activator.java
index d94a67a..2c57ca1 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/internal/Activator.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/internal/Activator.java
@@ -21,9 +21,9 @@ package org.apache.zest.runtime.internal;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
-import org.apache.zest.bootstrap.Qi4jRuntime;
+import org.apache.zest.bootstrap.ZestRuntime;
 import org.apache.zest.bootstrap.RuntimeFactory;
-import org.apache.zest.runtime.Qi4jRuntimeImpl;
+import org.apache.zest.runtime.ZestRuntimeImpl;
 
 /**
  *
@@ -40,9 +40,9 @@ public class Activator
         RuntimeFactory factory = new RuntimeFactory()
         {
             @Override
-            public Qi4jRuntime createRuntime()
+            public ZestRuntime createRuntime()
             {
-                return new Qi4jRuntimeImpl();
+                return new ZestRuntimeImpl();
             }
         };
         registration = bundleContext.registerService( RuntimeFactory.class.getName(), factory, null );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationInstance.java
index cd739e0..9a228ad 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationInstance.java
@@ -24,7 +24,7 @@ import org.apache.zest.api.structure.Application;
 import org.apache.zest.api.structure.ApplicationDescriptor;
 import org.apache.zest.api.structure.Layer;
 import org.apache.zest.api.structure.Module;
-import org.apache.zest.bootstrap.Qi4jRuntime;
+import org.apache.zest.bootstrap.ZestRuntime;
 import org.apache.zest.runtime.activation.ActivationDelegate;
 
 /**
@@ -36,13 +36,13 @@ public class ApplicationInstance
 
     // Constructor parameters
     private final ApplicationModel applicationModel;
-    private final Qi4jRuntime runtime;
+    private final ZestRuntime runtime;
     private final MetaInfo instanceMetaInfo;
     // Eager instance objects
     private final ActivationDelegate activation;
     private final List<LayerInstance> layerInstances;
 
-    public ApplicationInstance( ApplicationModel model, Qi4jRuntime runtime, MetaInfo instanceMetaInfo )
+    public ApplicationInstance( ApplicationModel model, ZestRuntime runtime, MetaInfo instanceMetaInfo )
     {
         // Constructor parameters
         this.applicationModel = model;
@@ -154,7 +154,7 @@ public class ApplicationInstance
         layerInstances.add( layer );
     }
 
-    public Qi4jRuntime runtime()
+    public ZestRuntime runtime()
     {
         return runtime;
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
index a5e9d5b..fdcedfe 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
@@ -19,13 +19,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.activation.ActivationException;
 import org.apache.zest.api.common.InvalidApplicationException;
 import org.apache.zest.api.common.MetaInfo;
 import org.apache.zest.api.structure.Application;
 import org.apache.zest.api.structure.ApplicationDescriptor;
-import org.apache.zest.bootstrap.Qi4jRuntime;
+import org.apache.zest.bootstrap.ZestRuntime;
 import org.apache.zest.functional.HierarchicalVisitor;
 import org.apache.zest.runtime.activation.ActivatorsInstance;
 import org.apache.zest.runtime.activation.ActivatorsModel;
@@ -112,7 +112,7 @@ public final class ApplicationModel
     }
 
     @Override
-    public ApplicationInstance newInstance( Qi4j runtime, Object... importedServiceInstances )
+    public ApplicationInstance newInstance( ZestAPI runtime, Object... importedServiceInstances )
         throws InvalidApplicationException
     {
         MetaInfo instanceMetaInfo = new MetaInfo( metaInfo );
@@ -121,7 +121,7 @@ public final class ApplicationModel
             instanceMetaInfo.set( importedServiceInstance );
         }
 
-        ApplicationInstance applicationInstance = new ApplicationInstance( this, (Qi4jRuntime) runtime, instanceMetaInfo );
+        ApplicationInstance applicationInstance = new ApplicationInstance( this, (ZestRuntime) runtime, instanceMetaInfo );
 
         // Create layer instances
         Map<LayerModel, LayerInstance> layerInstanceMap = new HashMap<>();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/api/common/OptionalTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/api/common/OptionalTest.java b/core/runtime/src/test/java/org/apache/zest/api/common/OptionalTest.java
index 0beba71..355ee8e 100644
--- a/core/runtime/src/test/java/org/apache/zest/api/common/OptionalTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/api/common/OptionalTest.java
@@ -26,7 +26,7 @@ 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.hamcrest.CoreMatchers.notNullValue;
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertThat;
  * Tests for @Optional
  */
 public class OptionalTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/api/common/PropertyErrorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/api/common/PropertyErrorTest.java b/core/runtime/src/test/java/org/apache/zest/api/common/PropertyErrorTest.java
index e82508b..1201329 100644
--- a/core/runtime/src/test/java/org/apache/zest/api/common/PropertyErrorTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/api/common/PropertyErrorTest.java
@@ -21,14 +21,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;
 
 /**
  * Error messages for Properties
  */
 public class PropertyErrorTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/api/common/PropertyTypeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/api/common/PropertyTypeTest.java b/core/runtime/src/test/java/org/apache/zest/api/common/PropertyTypeTest.java
index a76031f..4bcc88a 100644
--- a/core/runtime/src/test/java/org/apache/zest/api/common/PropertyTypeTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/api/common/PropertyTypeTest.java
@@ -28,14 +28,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;
 
 /**
  * Test for ability to set constraints on Properties
  */
 public class PropertyTypeTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/api/common/RemovalTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/api/common/RemovalTest.java b/core/runtime/src/test/java/org/apache/zest/api/common/RemovalTest.java
index 135d682..76b80bf 100644
--- a/core/runtime/src/test/java/org/apache/zest/api/common/RemovalTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/api/common/RemovalTest.java
@@ -26,11 +26,11 @@ 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;
 
 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/95d31c05/core/runtime/src/test/java/org/apache/zest/api/common/ValueCompositeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/api/common/ValueCompositeTest.java b/core/runtime/src/test/java/org/apache/zest/api/common/ValueCompositeTest.java
index 00fedc3..77d1a96 100644
--- a/core/runtime/src/test/java/org/apache/zest/api/common/ValueCompositeTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/api/common/ValueCompositeTest.java
@@ -27,7 +27,7 @@ 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;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
  * Tests for ValueComposites
  */
 public class ValueCompositeTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java b/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
index 8307140..1a85577 100644
--- a/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/constraints/PropertyConstraintTest.java
@@ -29,13 +29,13 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.constraints.MinLengthConstraint;
 import org.apache.zest.library.constraints.annotation.Matches;
 import org.apache.zest.library.constraints.annotation.MinLength;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class PropertyConstraintTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @org.junit.Test
     public void givenConstraintOnPropertyWhenInvalidValueThenThrowException()

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
index 02eff2e..9f9fea2 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi230/Qi230IssueTest.java
@@ -15,7 +15,7 @@
 package org.apache.zest.regression.qi230;
 
 import org.junit.Test;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.concern.ConcernOf;
 import org.apache.zest.api.concern.Concerns;
@@ -27,7 +27,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.assertEquals;
 
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals;
  * JAVADOC
  */
 public class Qi230IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException
@@ -115,7 +115,7 @@ public class Qi230IssueTest
         implements Other
     {
         @Structure
-        private Qi4j api;
+        private ZestAPI api;
 
         @This
         private Composite me;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
index 8cafbe6..0524c64 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java
@@ -28,7 +28,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.core.IsEqual.equalTo;
@@ -36,7 +36,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertThat;
 
 public class InterfaceCollisionWithRelatedReturnTypesTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
index cef8c94..4fdbf1d 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/InterfaceCollisionWithUnrelatedReturnTypesTest.java
@@ -21,10 +21,10 @@ import org.apache.zest.api.common.UseDefaults;
 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;
 
 public class InterfaceCollisionWithUnrelatedReturnTypesTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Override
@@ -47,7 +47,7 @@ public class InterfaceCollisionWithUnrelatedReturnTypesTest
 
     /**
      * DOESN'T COMPILE!!!
-     * java: types org.qi4j.regression.qi377.InterfaceCollisionWithUnrelatedReturnTypesTest.Robot and org.qi4j.regression.qi377.InterfaceCollisionWithUnrelatedReturnTypesTest.Person are incompatible; both define name(), but with unrelated return types
+     * java: types org.apache.zest.regression.qi377.InterfaceCollisionWithUnrelatedReturnTypesTest.Robot and org.apache.zest.regression.qi377.InterfaceCollisionWithUnrelatedReturnTypesTest.Person are incompatible; both define name(), but with unrelated return types
      */
 //    public interface TeamMember extends Person, Robot {}
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
index 959d29d..8ce8c77 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/IssueTest.java
@@ -22,13 +22,13 @@ import org.apache.zest.api.common.UseDefaults;
 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.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 
 public class IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
index b057c4e..a2933be 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/SetAssociationInSideEffectTest.java
@@ -33,7 +33,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 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.hamcrest.core.Is.is;
@@ -42,7 +42,7 @@ import static org.hamcrest.core.IsSame.theInstance;
 import static org.junit.Assert.assertThat;
 
 public class SetAssociationInSideEffectTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
index 276d393..d51309c 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi377/ValueCollisionWithRelatedReturnTypesTest.java
@@ -27,10 +27,10 @@ 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;
 
 public class ValueCollisionWithRelatedReturnTypesTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java b/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
index 36831b2..ea2ebc1 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi382/Qi382Test.java
@@ -33,14 +33,14 @@ import org.apache.zest.api.value.ValueSerialization;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.assertThat;
 
-public class Qi382Test extends AbstractQi4jTest
+public class Qi382Test extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java b/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
index 8a50f61..c4461cb 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi383/Qi383Test.java
@@ -26,10 +26,10 @@ import org.apache.zest.api.value.ValueSerialization;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.entitystore.memory.MemoryEntityStoreService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
 
-public class Qi383Test extends AbstractQi4jTest
+public class Qi383Test extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
index d13e846..58b33c3 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi53/IssueTest.java
@@ -29,12 +29,12 @@ import org.apache.zest.api.property.Immutable;
 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 IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
index a823adc..f170407 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi55/IssueTest.java
@@ -22,12 +22,12 @@ 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.junit.Assert.assertEquals;
 
 public class IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
index 99d62b0..0363137 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi59/IssueTest.java
@@ -21,7 +21,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.constraints.annotation.NotEmpty;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.fail;
@@ -30,7 +30,7 @@ import static org.junit.Assert.fail;
  * Test for QI-59
  */
 public class IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
index 00ad687..676183d 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi65/IssueTest.java
@@ -23,10 +23,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 IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private final static Class<?> CLAZZ = Object.class;
     private final static String METHOD_NAME = "toString";

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
index ea43caa..1a0a1ff 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi74/IssueTest.java
@@ -25,10 +25,10 @@ import org.apache.zest.api.constraint.ConstraintViolationException;
 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;
 
 public class IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
index d142bf6..2fd8a7a 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
@@ -36,9 +36,9 @@ public class IssueTest
     public void testLayersCanBeCreatedInOrderDifferentFromTheirDependency()
         throws AssemblyException
     {
-        Energy4Java qi4j = new Energy4Java();
+        Energy4Java zest = new Energy4Java();
 
-        Application app = qi4j.newApplication( new ApplicationAssembler()
+        Application app = zest.newApplication( new ApplicationAssembler()
         {
             public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )
                 throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
index 0ce42de..d799ddc 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi94/IssueTest.java
@@ -25,13 +25,13 @@ 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;
 
 public class IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @SuppressWarnings( "unchecked" )
     public void assemble( ModuleAssembly aModule )
@@ -48,7 +48,7 @@ public class IssueTest
         try
         {
             EntityBuilder<Item> builder = uow.newEntityBuilder( Item.class );
-            assertEquals( ItemType.class, qi4j.api()
+            assertEquals( ItemType.class, zest.api()
                 .entityDescriptorFor( builder.instance() )
                 .state()
                 .getAssociationByName( "typeOfItem" )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jAPITest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jAPITest.java b/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jAPITest.java
deleted file mode 100644
index 94457a7..0000000
--- a/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jAPITest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.runtime;
-
-import org.junit.Test;
-import org.apache.zest.api.composite.TransientComposite;
-import org.apache.zest.api.entity.EntityComposite;
-import org.apache.zest.api.service.ServiceComposite;
-import org.apache.zest.api.unitofwork.UnitOfWork;
-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.EntityTestAssembler;
-
-/**
- * JAVADOC
- */
-public class Qi4jAPITest
-    extends AbstractQi4jTest
-{
-    public void assemble( ModuleAssembly module )
-        throws AssemblyException
-    {
-        new EntityTestAssembler().assemble( module );
-        module.transients( TestTransient.class );
-        module.entities( TestEntity.class );
-        module.values( TestValue.class );
-        module.services( TestService.class );
-    }
-
-    @Test
-    public void testGetModuleOfComposite()
-        throws Exception
-    {
-        UnitOfWork unitOfWork = module.newUnitOfWork();
-        TestEntity testEntity = unitOfWork.newEntity( TestEntity.class );
-
-        api.moduleOf( testEntity );
-
-        unitOfWork.discard();
-
-        api.moduleOf( module.newValue( TestValue.class ) );
-
-        api.moduleOf( module.newTransient( TestTransient.class ) );
-
-        api.moduleOf( module.findService( TestService.class ).get() );
-    }
-
-    public interface TestTransient
-        extends TransientComposite
-    {
-    }
-
-    public interface TestEntity
-        extends EntityComposite
-    {
-    }
-
-    public interface TestValue
-        extends ValueComposite
-    {
-    }
-
-    public interface TestService
-        extends ServiceComposite
-    {
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jSPITest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jSPITest.java b/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jSPITest.java
deleted file mode 100644
index 96efa36..0000000
--- a/core/runtime/src/test/java/org/apache/zest/runtime/Qi4jSPITest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.runtime;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Test;
-import org.apache.zest.api.association.AbstractAssociation;
-import org.apache.zest.api.association.Association;
-import org.apache.zest.api.association.AssociationDescriptor;
-import org.apache.zest.api.association.AssociationStateDescriptor;
-import org.apache.zest.api.association.AssociationStateHolder;
-import org.apache.zest.api.association.ManyAssociation;
-import org.apache.zest.api.common.Optional;
-import org.apache.zest.api.entity.EntityBuilder;
-import org.apache.zest.api.entity.EntityComposite;
-import org.apache.zest.api.entity.EntityDescriptor;
-import org.apache.zest.api.property.Property;
-import org.apache.zest.api.property.PropertyDescriptor;
-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.EntityTestAssembler;
-
-import static org.junit.Assert.assertThat;
-
-/**
- * JAVADOC
- */
-public class Qi4jSPITest
-    extends AbstractQi4jTest
-{
-    public void assemble( ModuleAssembly module )
-        throws AssemblyException
-    {
-        new EntityTestAssembler().assemble( module );
-        module.entities( TestEntity.class, TestEntity2.class );
-    }
-
-    @Test
-    public void givenEntityWhenGettingStateThenGetCorrectState()
-        throws Exception
-    {
-        UnitOfWork unitOfWork = module.newUnitOfWork();
-        TestEntity testEntity;
-        try
-        {
-            EntityBuilder<TestEntity> builder = unitOfWork.newEntityBuilder( TestEntity.class );
-
-            testEntity = builder.newInstance();
-
-            AssociationStateHolder state = spi.stateOf( testEntity );
-
-            validateState( state, spi.entityDescriptorFor( testEntity ) );
-
-            unitOfWork.complete();
-        }
-        finally
-        {
-            unitOfWork.discard();
-        }
-
-        UnitOfWork uow = module.newUnitOfWork();
-        try
-        {
-            testEntity = uow.get( testEntity );
-            validateState( spi.stateOf( testEntity ), spi.entityDescriptorFor( testEntity ) );
-            uow.complete();
-        }
-        finally
-        {
-            uow.discard();
-        }
-    }
-
-    private void validateState( AssociationStateHolder state, EntityDescriptor entityDescriptor )
-    {
-        for( PropertyDescriptor propertyDescriptor : entityDescriptor.state().properties() )
-        {
-            Property<?> prop = state.propertyFor( propertyDescriptor.accessor() );
-            assertThat( "Properties could be listed", prop, CoreMatchers.notNullValue() );
-        }
-
-        AssociationStateDescriptor descriptor = entityDescriptor.state();
-        for( AssociationDescriptor associationDescriptor : descriptor.associations() )
-        {
-            AbstractAssociation assoc = state.associationFor( associationDescriptor.accessor() );
-            assertThat( "Assocs could be listed", assoc, CoreMatchers.notNullValue() );
-        }
-    }
-
-    public interface TestEntity
-        extends EntityComposite
-    {
-        @Optional
-        Property<String> property();
-
-        @Optional
-        Association<TestEntity> association();
-
-        ManyAssociation<TestEntity> manyAssociation();
-    }
-
-    public interface TestEntity2
-        extends EntityComposite
-    {
-        @Optional
-        Property<String> property();
-
-        @Optional
-        Association<TestEntity> association();
-
-        ManyAssociation<TestEntity> manyAssociation();
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/ZestAPITest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/ZestAPITest.java b/core/runtime/src/test/java/org/apache/zest/runtime/ZestAPITest.java
new file mode 100644
index 0000000..df40a4d
--- /dev/null
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/ZestAPITest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.zest.runtime;
+
+import org.junit.Test;
+import org.apache.zest.api.composite.TransientComposite;
+import org.apache.zest.api.entity.EntityComposite;
+import org.apache.zest.api.service.ServiceComposite;
+import org.apache.zest.api.unitofwork.UnitOfWork;
+import org.apache.zest.api.value.ValueComposite;
+import org.apache.zest.bootstrap.AssemblyException;
+import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.test.AbstractZestTest;
+import org.apache.zest.test.EntityTestAssembler;
+
+/**
+ * JAVADOC
+ */
+public class ZestAPITest
+    extends AbstractZestTest
+{
+    public void assemble( ModuleAssembly module )
+        throws AssemblyException
+    {
+        new EntityTestAssembler().assemble( module );
+        module.transients( TestTransient.class );
+        module.entities( TestEntity.class );
+        module.values( TestValue.class );
+        module.services( TestService.class );
+    }
+
+    @Test
+    public void testGetModuleOfComposite()
+        throws Exception
+    {
+        UnitOfWork unitOfWork = module.newUnitOfWork();
+        TestEntity testEntity = unitOfWork.newEntity( TestEntity.class );
+
+        api.moduleOf( testEntity );
+
+        unitOfWork.discard();
+
+        api.moduleOf( module.newValue( TestValue.class ) );
+
+        api.moduleOf( module.newTransient( TestTransient.class ) );
+
+        api.moduleOf( module.findService( TestService.class ).get() );
+    }
+
+    public interface TestTransient
+        extends TransientComposite
+    {
+    }
+
+    public interface TestEntity
+        extends EntityComposite
+    {
+    }
+
+    public interface TestValue
+        extends ValueComposite
+    {
+    }
+
+    public interface TestService
+        extends ServiceComposite
+    {
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/ZestSPITest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/ZestSPITest.java b/core/runtime/src/test/java/org/apache/zest/runtime/ZestSPITest.java
new file mode 100644
index 0000000..9c4e205
--- /dev/null
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/ZestSPITest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.zest.runtime;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+import org.apache.zest.api.association.AbstractAssociation;
+import org.apache.zest.api.association.Association;
+import org.apache.zest.api.association.AssociationDescriptor;
+import org.apache.zest.api.association.AssociationStateDescriptor;
+import org.apache.zest.api.association.AssociationStateHolder;
+import org.apache.zest.api.association.ManyAssociation;
+import org.apache.zest.api.common.Optional;
+import org.apache.zest.api.entity.EntityBuilder;
+import org.apache.zest.api.entity.EntityComposite;
+import org.apache.zest.api.entity.EntityDescriptor;
+import org.apache.zest.api.property.Property;
+import org.apache.zest.api.property.PropertyDescriptor;
+import org.apache.zest.api.unitofwork.UnitOfWork;
+import org.apache.zest.bootstrap.AssemblyException;
+import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.test.AbstractZestTest;
+import org.apache.zest.test.EntityTestAssembler;
+
+import static org.junit.Assert.assertThat;
+
+/**
+ * JAVADOC
+ */
+public class ZestSPITest
+    extends AbstractZestTest
+{
+    public void assemble( ModuleAssembly module )
+        throws AssemblyException
+    {
+        new EntityTestAssembler().assemble( module );
+        module.entities( TestEntity.class, TestEntity2.class );
+    }
+
+    @Test
+    public void givenEntityWhenGettingStateThenGetCorrectState()
+        throws Exception
+    {
+        UnitOfWork unitOfWork = module.newUnitOfWork();
+        TestEntity testEntity;
+        try
+        {
+            EntityBuilder<TestEntity> builder = unitOfWork.newEntityBuilder( TestEntity.class );
+
+            testEntity = builder.newInstance();
+
+            AssociationStateHolder state = spi.stateOf( testEntity );
+
+            validateState( state, spi.entityDescriptorFor( testEntity ) );
+
+            unitOfWork.complete();
+        }
+        finally
+        {
+            unitOfWork.discard();
+        }
+
+        UnitOfWork uow = module.newUnitOfWork();
+        try
+        {
+            testEntity = uow.get( testEntity );
+            validateState( spi.stateOf( testEntity ), spi.entityDescriptorFor( testEntity ) );
+            uow.complete();
+        }
+        finally
+        {
+            uow.discard();
+        }
+    }
+
+    private void validateState( AssociationStateHolder state, EntityDescriptor entityDescriptor )
+    {
+        for( PropertyDescriptor propertyDescriptor : entityDescriptor.state().properties() )
+        {
+            Property<?> prop = state.propertyFor( propertyDescriptor.accessor() );
+            assertThat( "Properties could be listed", prop, CoreMatchers.notNullValue() );
+        }
+
+        AssociationStateDescriptor descriptor = entityDescriptor.state();
+        for( AssociationDescriptor associationDescriptor : descriptor.associations() )
+        {
+            AbstractAssociation assoc = state.associationFor( associationDescriptor.accessor() );
+            assertThat( "Assocs could be listed", assoc, CoreMatchers.notNullValue() );
+        }
+    }
+
+    public interface TestEntity
+        extends EntityComposite
+    {
+        @Optional
+        Property<String> property();
+
+        @Optional
+        Association<TestEntity> association();
+
+        ManyAssociation<TestEntity> manyAssociation();
+    }
+
+    public interface TestEntity2
+        extends EntityComposite
+    {
+        @Optional
+        Property<String> property();
+
+        @Optional
+        Association<TestEntity> association();
+
+        ManyAssociation<TestEntity> manyAssociation();
+    }
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToFilterTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToFilterTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToFilterTest.java
index deb8c9a..48a7682 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToFilterTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToFilterTest.java
@@ -28,13 +28,13 @@ import org.apache.zest.api.concern.GenericConcern;
 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 the AppliesToFilter
  */
 public class AppliesToFilterTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToOrConditionQI241Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToOrConditionQI241Test.java b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToOrConditionQI241Test.java
index acd97a4..7054b37 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToOrConditionQI241Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToOrConditionQI241Test.java
@@ -38,12 +38,12 @@ 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 static org.junit.Assert.assertTrue;
 
 public class AppliesToOrConditionQI241Test
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToTest.java
index 6509d74..1993d39 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/AppliesToTest.java
@@ -28,13 +28,13 @@ import org.apache.zest.api.concern.Concerns;
 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 the @AppliesTo annotation
  */
 public class AppliesToTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/FragmentAppliesToTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/FragmentAppliesToTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/FragmentAppliesToTest.java
index 8197d98..f29b850 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/FragmentAppliesToTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/appliesto/FragmentAppliesToTest.java
@@ -35,13 +35,13 @@ 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.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public class FragmentAppliesToTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationEqualityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationEqualityTest.java
index 9bd14ee..ab5222f 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/association/AssociationEqualityTest.java
@@ -26,7 +26,7 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
 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 org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
  * Assert that Association, ManyAssociation and NamedAssociation equals/hashcode methods combine AssociationDescriptor and State.
  */
 public class AssociationEqualityTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     //
@@ -90,14 +90,14 @@ public class AssociationEqualityTest
             AnEntity anEntity = uow.newEntity( AnEntity.class );
 
             SomeWithAssociations some = buildSomeWithAssociation( anEntity );
-            AssociationDescriptor someAssocDesc = qi4j.api().associationDescriptorFor( some.anEntity() );
-            AssociationDescriptor someManyAssocDesc = qi4j.api().associationDescriptorFor( some.manyEntities() );
-            AssociationDescriptor someNamedAssocDesc = qi4j.api().associationDescriptorFor( some.namedEntities() );
+            AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() );
+            AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() );
+            AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() );
 
             SomeWithAssociations some2 = buildSomeWithAssociation( anEntity );
-            AssociationDescriptor some2AssocDesc = qi4j.api().associationDescriptorFor( some2.anEntity() );
-            AssociationDescriptor some2ManyAssocDesc = qi4j.api().associationDescriptorFor( some2.manyEntities() );
-            AssociationDescriptor some2NamedAssocDesc = qi4j.api().associationDescriptorFor( some2.namedEntities() );
+            AssociationDescriptor some2AssocDesc = zest.api().associationDescriptorFor( some2.anEntity() );
+            AssociationDescriptor some2ManyAssocDesc = zest.api().associationDescriptorFor( some2.manyEntities() );
+            AssociationDescriptor some2NamedAssocDesc = zest.api().associationDescriptorFor( some2.namedEntities() );
 
             assertThat( "AssociationDescriptor equal",
                         someAssocDesc,
@@ -131,14 +131,14 @@ public class AssociationEqualityTest
         try
         {
             SomeWithAssociations some = buildSomeWithAssociation( uow.newEntity( AnEntity.class ) );
-            AssociationDescriptor someAssocDesc = qi4j.api().associationDescriptorFor( some.anEntity() );
-            AssociationDescriptor someManyAssocDesc = qi4j.api().associationDescriptorFor( some.manyEntities() );
-            AssociationDescriptor someNamedAssocDesc = qi4j.api().associationDescriptorFor( some.namedEntities() );
+            AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() );
+            AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() );
+            AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() );
 
             SomeWithAssociations some2 = buildSomeWithAssociation( uow.newEntity( AnEntity.class ) );
-            AssociationDescriptor some2AssocDesc = qi4j.api().associationDescriptorFor( some2.anEntity() );
-            AssociationDescriptor some2ManyAssocDesc = qi4j.api().associationDescriptorFor( some2.manyEntities() );
-            AssociationDescriptor some2NamedAssocDesc = qi4j.api().associationDescriptorFor( some2.namedEntities() );
+            AssociationDescriptor some2AssocDesc = zest.api().associationDescriptorFor( some2.anEntity() );
+            AssociationDescriptor some2ManyAssocDesc = zest.api().associationDescriptorFor( some2.manyEntities() );
+            AssociationDescriptor some2NamedAssocDesc = zest.api().associationDescriptorFor( some2.namedEntities() );
 
             assertThat( "AssociationDescriptor equal",
                         someAssocDesc,
@@ -174,14 +174,14 @@ public class AssociationEqualityTest
             AnEntity anEntity = uow.newEntity( AnEntity.class );
 
             SomeWithAssociations some = buildSomeWithAssociation( anEntity );
-            AssociationDescriptor someAssocDesc = qi4j.api().associationDescriptorFor( some.anEntity() );
-            AssociationDescriptor someManyAssocDesc = qi4j.api().associationDescriptorFor( some.manyEntities() );
-            AssociationDescriptor someNamedAssocDesc = qi4j.api().associationDescriptorFor( some.namedEntities() );
+            AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() );
+            AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() );
+            AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() );
 
             OtherWithAssociations other = buildOtherWithAssociation( anEntity );
-            AssociationDescriptor otherAssocDesc = qi4j.api().associationDescriptorFor( other.anEntity() );
-            AssociationDescriptor otherManyAssocDesc = qi4j.api().associationDescriptorFor( other.manyEntities() );
-            AssociationDescriptor otherNamedAssocDesc = qi4j.api().associationDescriptorFor( other.namedEntities() );
+            AssociationDescriptor otherAssocDesc = zest.api().associationDescriptorFor( other.anEntity() );
+            AssociationDescriptor otherManyAssocDesc = zest.api().associationDescriptorFor( other.manyEntities() );
+            AssociationDescriptor otherNamedAssocDesc = zest.api().associationDescriptorFor( other.namedEntities() );
 
             assertThat( "AssociationDescriptor not equal",
                         someAssocDesc,

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/DereferenceForBootstrappedConcernsTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/DereferenceForBootstrappedConcernsTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/DereferenceForBootstrappedConcernsTest.java
index 9fd2902..b7d7a68 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/DereferenceForBootstrappedConcernsTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/DereferenceForBootstrappedConcernsTest.java
@@ -19,7 +19,7 @@
 package org.apache.zest.runtime.bootstrap;
 
 import org.junit.Test;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.concern.ConcernOf;
 import org.apache.zest.api.concern.Concerns;
@@ -31,12 +31,12 @@ 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.assertEquals;
 
 public class DereferenceForBootstrappedConcernsTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )
@@ -117,7 +117,7 @@ public class DereferenceForBootstrappedConcernsTest
         implements Other
     {
         @Structure
-        private Qi4j api;
+        private ZestAPI api;
 
         @This
         private Composite me;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/AbstractMixinTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/AbstractMixinTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/AbstractMixinTest.java
index dd5869f..9720920 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/AbstractMixinTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/AbstractMixinTest.java
@@ -28,18 +28,18 @@ import org.apache.zest.api.property.Property;
 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;
 
 /**
  * JAVADOC
  */
 public class AbstractMixinTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException
     {
-        System.setProperty( "qi4j.compacttrace", "off" );
+        System.setProperty( "zest.compacttrace", "off" );
         module.transients( TestComposite.class );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/CompositeFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/CompositeFactoryImplTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/CompositeFactoryImplTest.java
index ba72a99..cca8c1a 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/CompositeFactoryImplTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/CompositeFactoryImplTest.java
@@ -24,12 +24,12 @@ 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.junit.Assert.fail;
 
 public class CompositeFactoryImplTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/FunctionalListTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/FunctionalListTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/FunctionalListTest.java
index 22186de..43e9e44 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/FunctionalListTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/FunctionalListTest.java
@@ -28,12 +28,12 @@ import org.apache.zest.api.structure.Module;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.functional.Function;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.junit.Assert.assertThat;
 
-public class FunctionalListTest extends AbstractQi4jTest
+public class FunctionalListTest extends AbstractZestTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/MapOverrideTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/MapOverrideTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/MapOverrideTest.java
index dd8d468..e75a057 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/MapOverrideTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/MapOverrideTest.java
@@ -29,7 +29,7 @@ import org.apache.zest.api.injection.scope.This;
 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.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat;
  */
 @Ignore( "Awaiting QI-298" )
 public class MapOverrideTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test1.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test1.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test1.java
index de38135..f02c8a4 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test1.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test1.java
@@ -23,7 +23,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.junit.Assert.assertSame;
 import static org.junit.Assert.assertEquals;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class QI247Test1
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test2.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test2.java
index 47a8a8d..e0783bb 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test2.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI247Test2.java
@@ -25,7 +25,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.junit.Assert.assertSame;
 import static org.junit.Assert.assertEquals;
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class QI247Test2
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI256Test.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI256Test.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI256Test.java
index 1cc3f3b..b99b4e1 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI256Test.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/QI256Test.java
@@ -19,13 +19,13 @@ 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;
 
 /**
  * JAVADOC
  */
 public class QI256Test
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public static class TestException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/composite/TransientAsClassTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/composite/TransientAsClassTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/composite/TransientAsClassTest.java
index ef9f84e..226dd47 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/composite/TransientAsClassTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/composite/TransientAsClassTest.java
@@ -22,7 +22,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 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.junit.Assert.assertThat;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  */
 @Ignore( "Awaiting QI-298" )
 public class TransientAsClassTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public static class UnderTest
     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/concerns/GenericConcernTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/GenericConcernTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/GenericConcernTest.java
index 8692f0f..9a951d9 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/GenericConcernTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/GenericConcernTest.java
@@ -24,13 +24,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;
 
 /**
  * Tests for GenericConcern
  */
 public class GenericConcernTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/concerns/ModuleConcernTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/ModuleConcernTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/ModuleConcernTest.java
index 640dcfe..97fa16d 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/ModuleConcernTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/ModuleConcernTest.java
@@ -24,7 +24,7 @@ import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.AssemblyVisitorAdapter;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.bootstrap.TransientDeclaration;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat;
  * Test of declaring concern in assembly
  */
 public class ModuleConcernTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public static boolean ok;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/concerns/PropertyInheritanceTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/PropertyInheritanceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/PropertyInheritanceTest.java
index 7ff7630..55aef64 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/concerns/PropertyInheritanceTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/concerns/PropertyInheritanceTest.java
@@ -29,14 +29,14 @@ import org.apache.zest.api.property.InvalidPropertyTypeException;
 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.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 
 //TODO 2.0 removed this possibility when simplifying the Property handling. So, we are now checking that a decent
 // exception is thrown, but should be changed to supported instead.
-public class PropertyInheritanceTest extends AbstractQi4jTest
+public class PropertyInheritanceTest extends AbstractZestTest
 {
 
     private boolean failed;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.java
index a624a5a..3aeeb95 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.java
@@ -33,14 +33,14 @@ import org.apache.zest.api.constraint.Name;
 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 java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class ConstraintsTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.properties
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.properties b/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.properties
index bb18d5f..5f4c32d 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.properties
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/constraints/ConstraintsTest.properties
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-qi4j.constraint.ConstraintsTest$MyOneComposite=Message1
+zest.constraint.ConstraintsTest$MyOneComposite=Message1
 
-qi4j.constraint.NotNull=Message2
+zest.constraint.NotNull=Message2
 
-qi4j.constraint.ConstraintsTest$MyOneComposite.doSomething=Message3
+zest.constraint.ConstraintsTest$MyOneComposite.doSomething=Message3
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/defaults/UseDefaultsTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/defaults/UseDefaultsTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/defaults/UseDefaultsTest.java
index a8fe71d..2bce838 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/defaults/UseDefaultsTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/defaults/UseDefaultsTest.java
@@ -22,7 +22,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.hamcrest.CoreMatchers.nullValue;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
  * JAVADOC
  */
 public class UseDefaultsTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/entity/AggregatedTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/AggregatedTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/AggregatedTest.java
index 6d78550..1ee9665 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/AggregatedTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/AggregatedTest.java
@@ -25,7 +25,7 @@ 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.fail;
@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
  * JAVADOC
  */
 public class AggregatedTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java
index f516760..4fa4322 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java
@@ -34,7 +34,7 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.functional.Function;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -44,7 +44,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
  * EntityBuilder With State Test.
  */
 public class EntityBuilderWithStateTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Override
     public void assemble( ModuleAssembly module )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCompositeEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCompositeEqualityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCompositeEqualityTest.java
index 9cc5b74..980a3dd 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCompositeEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCompositeEqualityTest.java
@@ -28,7 +28,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;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertThat;
  * Testing of equality of entity composites.
  */
 public class EntityCompositeEqualityTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private UnitOfWork unitOfWork;
     private EntityBuilder<MyComposite> myCompositeBuilder;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCreationTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCreationTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCreationTest.java
index d58d73e..d514312 100755
--- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCreationTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityCreationTest.java
@@ -26,14 +26,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;
 
 /**
  * Test case for http://team.ops4j.org/browse/QI-274
  */
 public class EntityCreationTest
-        extends AbstractQi4jTest
+        extends AbstractZestTest
 {
 
     @Mixins( SomeEntityMixin.class )


Mime
View raw message