[exo-jcr-commits] exo-jcr SVN: r4574 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container and 1 other directory.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2011-07-01 07:39:42 -0400 (Fri, 01 Jul 2011)
New Revision: 4574

Modified:
   kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java
   kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
Log:
EXOJCR-1068 : fixing the test

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java	2011-07-01 09:50:10 UTC (rev 4573)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java	2011-07-01 11:39:42 UTC (rev 4574)
@@ -234,11 +234,11 @@
    @Override
    public ComponentAdapter unregisterComponent(Object componentKey)
    {
-      ComponentAdapter adapter = getComponentAdapter(componentKey);
+      Object componentInstance = getComponentInstance(componentKey);
 
-      if (managementContext != null && adapter != null)
+      if (managementContext != null && componentInstance != null)
       {
-         managementContext.unregister(adapter.getComponentInstance(this));
+         managementContext.unregister(componentInstance);
       }
       return super.unregisterComponent(componentKey);
    }

Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java	2011-07-01 09:50:10 UTC (rev 4573)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java	2011-07-01 11:39:42 UTC (rev 4574)
@@ -491,28 +491,40 @@
       public void destroyContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.destroy.add(this);
+         if (counter != null)
+         {
+            counter.destroy.add(this);
+         }
       }
 
       @Override
       public void initContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.init.add(this);
+         if (counter != null)
+         {
+            counter.init.add(this);
+         }
       }
 
       @Override
       public void startContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.start.add(this);
+         if (counter != null)
+         {
+            counter.start.add(this);
+         }
       }
 
       @Override
       public void stopContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.stop.add(this);
+         if (counter != null)
+         {
+            counter.stop.add(this);
+         }
       }
       
    }
@@ -530,28 +542,40 @@
       public void destroyContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.destroy.add(this);
+         if (counter != null)
+         {
+            counter.destroy.add(this);
+         }
       }
 
       @Override
       public void initContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.init.add(this);
+         if (counter != null)
+         {
+            counter.init.add(this);
+         }
       }
 
       @Override
       public void startContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.start.add(this);
+         if (counter != null)
+         {
+            counter.start.add(this);
+         }
       }
 
       @Override
       public void stopContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.stop.add(this);
+         if (counter != null)
+         {
+            counter.stop.add(this);
+         }
       }   
    }
    
@@ -567,28 +591,40 @@
       public void destroyContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.destroy.add(this);
+         if (counter != null)
+         {
+            counter.destroy.add(this);
+         }
       }
 
       @Override
       public void initContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.init.add(this);
+         if (counter != null)
+         {
+            counter.init.add(this);
+         }
       }
 
       @Override
       public void startContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.start.add(this);
+         if (counter != null)
+         {
+            counter.start.add(this);
+         }
       }
 
       @Override
       public void stopContainer(ExoContainer container) throws Exception
       {
          MyCounter counter = (MyCounter)container.getComponentInstanceOfType(MyCounter.class);
-         if (counter != null) counter.stop.add(this);
+         if (counter != null)
+         {
+            counter.stop.add(this);
+         }
       }
       
    }
@@ -636,7 +672,7 @@
       public Object getComponentInstance(PicoContainer arg0) throws PicoInitializationException,
          PicoIntrospectionException
       {
-         throw (PicoInitializationException)new Exception();
+         return "testKey";
       }
 
       public Class getComponentImplementation()
@@ -722,7 +758,9 @@
       public void init()
       {
          if (!c2.started)
+         {
             throw new IllegalStateException("C2 should be started");
+         }
       }
    }