You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/07/16 21:50:18 UTC
svn commit: r422515 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
test-data/spring-1.1.jar
test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
Author: jkuhnert
Date: Sun Jul 16 12:50:18 2006
New Revision: 422515
URL: http://svn.apache.org/viewvc?rev=422515&view=rev
Log:
Updated unit tests to run against non ant dl copy
Added:
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/spring-1.1.jar (with props)
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
Added: tapestry/tapestry4/trunk/tapestry-framework/src/test-data/spring-1.1.jar
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test-data/spring-1.1.jar?rev=422515&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/test-data/spring-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java?rev=422515&r1=422514&r2=422515&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java Sun Jul 16 12:50:18 2006
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.Serializable;
+import java.lang.reflect.Constructor;
import java.math.BigDecimal;
import java.net.URL;
import java.net.URLClassLoader;
@@ -30,6 +31,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.impl.DefaultClassResolver;
+import org.apache.hivemind.util.PropertyUtils;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.DataSqueezer;
import org.apache.tapestry.util.ComponentAddress;
@@ -379,14 +381,13 @@
{
}
}
-/*
+
public void testClassLoader() throws Exception
{
- File tempDir = new File(System.getProperty("java.io.tmpdir"));
- File projectRoot = new File(tempDir, "jakarta-tapestry");
- File springJAR = new File(projectRoot,
- "tapestry/target/module-lib/test-subject/spring/spring-1.1.jar");
-
+ File springJAR = new File("tapestry-framework/src/test-data/spring-1.1.jar");
+ if (!springJAR.exists())
+ springJAR = new File("src/test-data/spring-1.1.jar");
+
if (!springJAR.exists())
throw new RuntimeException("File " + springJAR
+ " does not exist; this should have been downloaded by the Ant build scripts.");
@@ -419,7 +420,7 @@
assertEquals("fred", PropertyUtils.read(output, "name"));
assertEquals("flintstone", PropertyUtils.read(output, "value"));
}
-*/
+
private ClassResolver newClassResolver(File jarFile) throws Exception
{
URLClassLoader classLoader = new URLClassLoader(new URL[]
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java?rev=422515&r1=422514&r2=422515&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java Sun Jul 16 12:50:18 2006
@@ -15,9 +15,11 @@
package org.apache.tapestry.record;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.*;
import java.io.File;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -28,6 +30,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.impl.DefaultClassResolver;
+import org.apache.hivemind.util.PropertyUtils;
import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
@@ -175,20 +178,18 @@
*
* @see org.apache.tapestry.junit.utils.TestDataSqueezer#testClassLoader()
*/
- /*
public void testEncodeDecodeCustomClass() throws Exception
{
- File tempDir = new File(System.getProperty("java.io.tmpdir"));
- File projectRoot = new File(tempDir, "jakarta-tapestry");
- File springJAR = new File(projectRoot,
- "tapestry/target/module-lib/test-subject/spring/spring-1.1.jar");
-
+ File springJAR = new File("tapestry-framework/src/test-data/spring-1.1.jar");
+ if (!springJAR.exists())
+ springJAR = new File("src/test-data/spring-1.1.jar");
+
if (!springJAR.exists())
throw new RuntimeException("File " + springJAR
+ " does not exist; this should have been downloaded by the Ant build scripts.");
-
+
ClassResolver resolver1 = newClassResolver(springJAR);
-
+
Class propertyValueClass = resolver1.findClass("org.springframework.beans.PropertyValue");
Constructor constructor = propertyValueClass.getConstructor(new Class[]
{ String.class, Object.class });
@@ -222,11 +223,10 @@
Object instance2 = pc.getNewValue();
assertNotSame(instance, instance2);
-
+
assertEquals("fred", PropertyUtils.read(instance2, "name"));
assertEquals("flintstone", PropertyUtils.read(instance2, "value"));
}
-*/
private ClassResolver newClassResolver(File jarFile) throws Exception
{
URLClassLoader classLoader = new URLClassLoader(new URL[]