Author: hlship
Date: Fri Apr 21 17:40:20 2006
New Revision: 396038
URL: http://svn.apache.org/viewcvs?rev=396038&view=rev
Log:
Refactor some of the tests, moving factory and trainer methods up to base
classes
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java?rev=396038&r1=396037&r2=396038&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
Fri Apr 21 17:40:20 2006
@@ -17,9 +17,13 @@
import java.lang.annotation.Annotation;
import java.util.List;
-import org.apache.tapestry.annotations.Retain;
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.transform.ClassTransformation;
+import org.apache.tapestry.util.CollectionFactory;
+
+import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* Base test case that adds a number of convienience factory and training
methods to
@@ -29,6 +33,11 @@
*/
public abstract class BaseTestCase extends TestBase
{
+ protected final void trainFindFieldsWithAnnotation(ClassTransformation
transformation,
+ Class<? extends Annotation> annotationClass, String... fieldNames)
+ {
+ trainFindFieldsWithAnnotation(transformation, annotationClass,
newList(fieldNames));
+ }
protected final void trainFindFieldsWithAnnotation(ClassTransformation
transformation,
Class<? extends Annotation> annotationClass, List<String>
fieldNames)
@@ -38,8 +47,8 @@
}
protected final <T extends Annotation> void trainGetFieldAnnotation(
- ClassTransformation transformation, String fieldName,
- Class<? extends Annotation> annotationClass, T annotation)
+ ClassTransformation transformation, String fieldName, Class<T>
annotationClass,
+ T annotation)
{
transformation.getFieldAnnotation(fieldName, annotationClass);
setReturnValue(annotation);
@@ -53,6 +62,16 @@
protected final ClassTransformation newClassTransformation()
{
return newMock(ClassTransformation.class);
+ }
+
+ protected final Log newLog()
+ {
+ return newMock(Log.class);
+ }
+
+ protected final InternalComponentResources newInternalComponentResources()
+ {
+ return newMock(InternalComponentResources.class);
}
}
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java?rev=396038&r1=396037&r2=396038&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
Fri Apr 21 17:40:20 2006
@@ -14,27 +14,20 @@
package org.apache.tapestry.internal.transform;
+import org.apache.tapestry.test.BaseTestCase;
+import org.testng.annotations.Test;
+
import static java.lang.Thread.currentThread;
import static org.testng.Assert.assertEquals;
-import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.transform.ComponentInstantiatorSourceImpl;
-import org.apache.tapestry.test.TestBase;
-import org.testng.annotations.Test;
-
/**
* Tests for [EMAIL PROTECTED]
org.apache.tapestry.internal.transform.ComponentInstantiatorSourceImpl}.
*
* @author Howard M. Lewis Ship
*/
-public class ComponentInstantiatorSourceImplTest extends TestBase
+public class ComponentInstantiatorSourceImplTest extends BaseTestCase
{
private final ClassLoader _defaultClassLoader =
currentThread().getContextClassLoader();
-
- protected final Log newLog()
- {
- return newMock(Log.class);
- }
@Test
public void controlledPackagesTest() throws Exception
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java?rev=396038&r1=396037&r2=396038&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
Fri Apr 21 17:40:20 2006
@@ -38,7 +38,7 @@
import org.apache.tapestry.internal.transform.pages.TargetObject;
import
org.apache.tapestry.internal.transform.worker.ImplementResourceAwareWorker;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.test.BaseTestCase;
import org.apache.tapestry.transform.ClassTransformWorker;
import org.apache.tapestry.transform.ClassTransformation;
import org.testng.annotations.Configuration;
@@ -55,7 +55,7 @@
/**
* @author Howard M. Lewis Ship
*/
-public class InternalClassTransformationImplTest extends TestBase
+public class InternalClassTransformationImplTest extends BaseTestCase
{
private ClassPool _classPool;
@@ -334,8 +334,8 @@
@Test
public void injectedField() throws Exception
{
- MutableComponentModel model = newMock(MutableComponentModel.class);
- InternalComponentResources resources =
newMock(InternalComponentResources.class);
+ MutableComponentModel model = newMutableComponentModel();
+ InternalComponentResources resources = newInternalComponentResources();
ClassLoader childLoader = newLoader();
@@ -365,7 +365,7 @@
@Test
public void wrongClassPassedToCreateInstantiator() throws Exception
{
- MutableComponentModel model = newMock(MutableComponentModel.class);
+ MutableComponentModel model = newMutableComponentModel();
ClassLoader childLoader = newLoader();
@@ -414,7 +414,7 @@
@Test
public void addImplementedInterface() throws Exception
{
- MutableComponentModel model = newMock(MutableComponentModel.class);
+ MutableComponentModel model = newMutableComponentModel();
replay();
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java?rev=396038&r1=396037&r2=396038&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java
Fri Apr 21 17:40:20 2006
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.transform.worker;
-import static org.apache.tapestry.util.CollectionFactory.newList;
-
-import java.util.Collections;
-import java.util.List;
-
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.test.BaseTestCase;
@@ -36,10 +31,7 @@
ClassTransformation ct = newClassTransformation();
MutableComponentModel model = newMutableComponentModel();
- // There are limits to the compiler's ability to infer types and
generics.
- // Assigning to an intermediate variable gets rid of warnings.
- List<String> names = Collections.emptyList();
- trainFindFieldsWithAnnotation(ct, Retain.class, names);
+ trainFindFieldsWithAnnotation(ct, Retain.class);
replay();
@@ -57,10 +49,7 @@
MutableComponentModel model = newMutableComponentModel();
Retain annotation = newMock(Retain.class);
- List<String> fieldNames = newList();
- fieldNames.add("fred");
-
- trainFindFieldsWithAnnotation(ct, Retain.class, fieldNames);
+ trainFindFieldsWithAnnotation(ct, Retain.class, "fred");
trainGetFieldAnnotation(ct, "fred", Retain.class, annotation);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
