You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2012/12/08 14:58:02 UTC
svn commit: r1418673 - in /incubator/onami/trunk/test/src:
main/java/org/apache/onami/test/ site/apt/ test/java/org/apache/onami/test/
test/java/org/apache/onami/test/guice/
Author: simonetripodi
Date: Sat Dec 8 13:58:00 2012
New Revision: 1418673
URL: http://svn.apache.org/viewvc?rev=1418673&view=rev
Log:
[ONAMI-25] Rename the JUniceRunner as OnamiRunner
Added:
incubator/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java
- copied, changed from r1418626, incubator/onami/trunk/test/src/main/java/org/apache/onami/test/JUniceRunner.java
Removed:
incubator/onami/trunk/test/src/main/java/org/apache/onami/test/JUniceRunner.java
Modified:
incubator/onami/trunk/test/src/site/apt/core.apt
incubator/onami/trunk/test/src/site/apt/guice.apt
incubator/onami/trunk/test/src/site/apt/mock.apt
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectJSR330ModuleClassTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockTypeTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/ServiceMockProviderTest.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
Copied: incubator/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java (from r1418626, incubator/onami/trunk/test/src/main/java/org/apache/onami/test/JUniceRunner.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java?p2=incubator/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java&p1=incubator/onami/trunk/test/src/main/java/org/apache/onami/test/JUniceRunner.java&r1=1418626&r2=1418673&rev=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/main/java/org/apache/onami/test/JUniceRunner.java (original)
+++ incubator/onami/trunk/test/src/main/java/org/apache/onami/test/OnamiRunner.java Sat Dec 8 13:58:00 2012
@@ -115,11 +115,11 @@ import com.google.inject.util.Modules;
*
* @see GuiceMockModule
*/
-public class JUniceRunner
+public class OnamiRunner
extends BlockJUnit4ClassRunner
{
- final private static Logger logger = Logger.getLogger( JUniceRunner.class.getName() );
+ final private static Logger logger = Logger.getLogger( OnamiRunner.class.getName() );
private Injector injector;
@@ -136,7 +136,7 @@ public class JUniceRunner
* @param klass The test case class to run.
* @throws org.junit.runners.model.InitializationError if any error occurs.
*/
- public JUniceRunner( Class<?> klass )
+ public OnamiRunner( Class<?> klass )
throws InitializationError
{
super( klass );
Modified: incubator/onami/trunk/test/src/site/apt/core.apt
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/site/apt/core.apt?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/site/apt/core.apt (original)
+++ incubator/onami/trunk/test/src/site/apt/core.apt Sat Dec 8 13:58:00 2012
@@ -1,5 +1,5 @@
------
- JUnice core - The JUniceRunner
+ JUnice core - The OnamiRunner
------
The Apache Onami developers team
------
@@ -24,11 +24,11 @@
~~ under the License.
~~
-JUnice core - The JUniceRunner
+JUnice core - The OnamiRunner
- The core of <Apache Onami-Test> is the <<<org.apache.onami.test.JUniceRunner>>> class, that's a
+ The core of <Apache Onami-Test> is the <<<org.apache.onami.test.OnamiRunner>>> class, that's a
<JUnit Runner> and extends <org.junit.internal.runners.BlockJUnit4ClassRunner>
- For each test case the <JUniceRunner> initializes a google-guice <injector>
+ For each test case the <OnamiRunner> initializes a google-guice <injector>
before that your test case class is instantiated.
So you have an injector ready to use already into any method <<...@BeforeClass>>.
@@ -39,7 +39,7 @@ Getting Started
way:
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
{
@@ -70,7 +70,7 @@ public interface AcmeDatabasePool
+----------------------------------------+
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public abstract class DatabasePoolInitTest
{
Modified: incubator/onami/trunk/test/src/site/apt/guice.apt
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/site/apt/guice.apt?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/site/apt/guice.apt (original)
+++ incubator/onami/trunk/test/src/site/apt/guice.apt Sat Dec 8 13:58:00 2012
@@ -57,7 +57,7 @@ public class SimpleModule
then users can reuse it specifying
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( { SimpleModule.class, AnotherAcmeModule.class } )
public class SimpleTest
{
@@ -103,7 +103,7 @@ public class ComplexModule
then, in the test class:
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
{
@@ -131,7 +131,7 @@ public class SimpleTest
<<<com.google.inject.Module>>>
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
extends AbstractModule
{
Modified: incubator/onami/trunk/test/src/site/apt/mock.apt
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/site/apt/mock.apt?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/site/apt/mock.apt (original)
+++ incubator/onami/trunk/test/src/site/apt/mock.apt Sat Dec 8 13:58:00 2012
@@ -46,7 +46,7 @@ Mock framework
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@MockFramework( MockType.MOCKITO )
public class SimpleTest
{
@@ -101,7 +101,7 @@ public class HelloWorld
Then, in the test class:
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
{
@@ -149,7 +149,7 @@ public class SimpleTest
You should delegate the mock creation to a method in this way:
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
{
@@ -188,7 +188,7 @@ public class ServiceMockProvider
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class SimpleTest
{
@@ -250,7 +250,7 @@ public class ServiceImpl
+----------------------------------------+
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( ServiceModule.class )
public class TestCustomInjectionTest
{
@@ -300,7 +300,7 @@ public class TestCustomInjectionTest
So if necessary you have to create a proper binding for this <<<org.apache.onami.test.annotation.Mock>>> field:
+----------------------------------------+
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class TestCustomInjectionTest
implements Module
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractTestCase.java Sat Dec 8 13:58:00 2012
@@ -21,7 +21,7 @@ package org.apache.onami.test;
import java.util.ArrayList;
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceModules;
import org.apache.onami.test.annotation.GuiceProvidedModules;
import org.apache.onami.test.data.SimpleModule;
@@ -31,7 +31,7 @@ import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.google.inject.name.Names;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( SimpleModule.class )
abstract public class AbstractTestCase
extends AbstractEmptyTestCase
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java Sat Dec 8 13:58:00 2012
@@ -22,7 +22,7 @@ package org.apache.onami.test;
import java.util.ArrayList;
import java.util.List;
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.HelloWorld;
import org.apache.onami.test.data.Service;
@@ -37,7 +37,7 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.TypeLiteral;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class InjectDependingMockObjectTestCase
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectJSR330ModuleClassTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectJSR330ModuleClassTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectJSR330ModuleClassTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectJSR330ModuleClassTestCase.java Sat Dec 8 13:58:00 2012
@@ -22,7 +22,7 @@ package org.apache.onami.test;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
import com.google.inject.AbstractModule;
import com.google.inject.name.Names;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class InjectJSR330ModuleClassTestCase
extends AbstractModule
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceModules;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.HelloWorld;
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
import com.google.inject.Injector;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( SimpleModule.class )
public class InjectMockObjectTestCase
extends AbstractMockTestCase
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectModuleClassTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,7 +29,7 @@ import com.google.inject.Inject;
import com.google.inject.name.Named;
import com.google.inject.name.Names;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class InjectModuleClassTestCase
extends AbstractModule
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectStaticSimpleTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceModules;
import org.apache.onami.test.annotation.GuiceProvidedModules;
import org.apache.onami.test.data.ComplexModule;
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
import com.google.inject.Module;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( SimpleModule.class )
public class InjectStaticSimpleTestCase
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockTypeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockTypeTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockTypeTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockTypeTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.annotation.MockObjType;
import org.apache.onami.test.data.Service;
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class MockTypeTestCase
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/MockitoFrameworkTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.HelloWorld;
import org.apache.onami.test.data.TelephonService;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class MockitoFrameworkTestCase
extends AbstractMockitoTestCase
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/ServiceMockProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/ServiceMockProviderTest.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/ServiceMockProviderTest.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/ServiceMockProviderTest.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.Service;
import org.apache.onami.test.data.ServiceMockProvider;
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class ServiceMockProviderTest
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/SimpleTest.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceModules;
import org.apache.onami.test.data.HelloWorld;
import org.apache.onami.test.data.SimpleModule;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( SimpleModule.class )
public class SimpleTest
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test.guice;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.HelloWordAnnotated;
import org.apache.onami.test.data.Service;
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
public class MockAnnotatedWithTestCase
{
Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java?rev=1418673&r1=1418672&r2=1418673&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java (original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java Sat Dec 8 13:58:00 2012
@@ -19,7 +19,7 @@ package org.apache.onami.test.guice;
* under the License.
*/
-import org.apache.onami.test.JUniceRunner;
+import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceModules;
import org.apache.onami.test.annotation.Mock;
import org.apache.onami.test.data.HelloWorld;
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
import com.google.inject.Inject;
-@RunWith( JUniceRunner.class )
+@RunWith( OnamiRunner.class )
@GuiceModules( ServiceModule.class )
public class TestCustomInjectionTest
{