stephan 2003/04/22 23:20:20
Modified: src/test/org/apache/cocoon AbstractCompositeTestCase.java
src/test/org/apache/cocoon/components/xmlform
XMLFormTestCase.java
src/test/org/apache/cocoon/environment/mock MockContext.java
MockResponse.java
src/test/org/apache/cocoon/transformation
AbstractTransformerTestCase.java
Log:
Fixed some bugs.
Revision Changes Path
1.2 +8 -4
cocoon-2.1/src/test/org/apache/cocoon/AbstractCompositeTestCase.java
Index: AbstractCompositeTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/AbstractCompositeTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractCompositeTestCase.java 22 Apr 2003 07:38:18 -0000 1.1
+++ AbstractCompositeTestCase.java 23 Apr 2003 06:20:20 -0000 1.2
@@ -133,8 +133,15 @@
}
public void setUp() {
+ objectmodel.clear();
+
+ request.reset();
objectmodel.put(ObjectModelHelper.REQUEST_OBJECT, request);
+
+ response.reset();
objectmodel.put(ObjectModelHelper.RESPONSE_OBJECT, response);
+
+ context.reset();
objectmodel.put(ObjectModelHelper.CONTEXT_OBJECT, context);
}
@@ -311,9 +318,6 @@
if (selector!=null)
this.manager.release(selector);
-
- if (resolver!=null)
- this.manager.release(resolver);
if (inputsource!=null)
resolver.release(inputsource);
1.2 +2 -2
cocoon-2.1/src/test/org/apache/cocoon/components/xmlform/XMLFormTestCase.java
Index: XMLFormTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/xmlform/XMLFormTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLFormTestCase.java 22 Apr 2003 07:38:18 -0000 1.1
+++ XMLFormTestCase.java 23 Apr 2003 06:20:20 -0000 1.2
@@ -109,7 +109,7 @@
String testform2 =
"resource://org/apache/cocoon/components/xmlform/testform2.xml";
String testresult2 =
"resource://org/apache/cocoon/components/xmlform/testresult2.xml";
- print(transform("xmlform", testform2, new Parameters(),
load(testform2)));
+ //print(transform("xmlform", testform2, new Parameters(),
load(testform2)));
assertEqual(load(testresult2), transform("xmlform", testform1, new
Parameters(), load(testform2)));
1.2 +7 -0
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockContext.java
Index: MockContext.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockContext.java 16 Apr 2003 10:54:00 -0000 1.1
+++ MockContext.java 23 Apr 2003 06:20:20 -0000 1.2
@@ -108,4 +108,11 @@
public InputStream getResourceAsStream(String path) {
return null;
}
+
+ public void reset() {
+ attributes.clear();
+ resources.clear();
+ mappings.clear();
+ initparameters.clear();
+ }
}
1.2 +7 -0
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockResponse.java
Index: MockResponse.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockResponse.java 16 Apr 2003 10:54:00 -0000 1.1
+++ MockResponse.java 23 Apr 2003 06:20:20 -0000 1.2
@@ -134,4 +134,11 @@
public Map getHeader() {
return header;
}
+
+ public void reset() {
+ encoding = null;
+ locale = null;
+ cookies.clear();
+ header.clear();
+ }
}
1.6 +1 -4
cocoon-2.1/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java
Index: AbstractTransformerTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTransformerTestCase.java 19 Apr 2003 16:10:32 -0000 1.5
+++ AbstractTransformerTestCase.java 23 Apr 2003 06:20:20 -0000 1.6
@@ -173,9 +173,6 @@
if (selector!=null)
this.manager.release(selector);
- if (resolver!=null)
- this.manager.release(resolver);
-
if (inputsource!=null)
resolver.release(inputsource);
