cziegeler 2003/10/15 14:00:24
Modified: src/test/org/apache/cocoon/components/source SourceResolverAdapter.java src/test/org/apache/cocoon/acting RequestParamActionTestCase.java src/test/org/apache/cocoon/components/resolver/test ResolverImplTestCase.java src/test/org/apache/cocoon AbstractCompositeTestCase.java src/test/org/apache/cocoon/environment/mock MockRequest.java src/test/org/apache/cocoon/xml/dom DOMBuilderStreamerTestCase.java src/test/org/apache/cocoon/transformation AbstractTransformerTestCase.java Log: Cleaning up code Revision Changes Path 1.9 +1 -3 cocoon-2.1/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java Index: SourceResolverAdapter.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SourceResolverAdapter.java 26 Jul 2003 14:48:39 -0000 1.8 +++ SourceResolverAdapter.java 15 Oct 2003 21:00:23 -0000 1.9 @@ -69,11 +69,9 @@ public class SourceResolverAdapter implements SourceResolver { private org.apache.excalibur.source.SourceResolver resolver; - private ComponentManager manager; public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver resolver, ComponentManager manager) { this.resolver = resolver; - this.manager = manager; } /** 1.2 +6 -6 cocoon-2.1/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java Index: RequestParamActionTestCase.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RequestParamActionTestCase.java 19 Apr 2003 16:11:17 -0000 1.1 +++ RequestParamActionTestCase.java 15 Oct 2003 21:00:23 -0000 1.2 @@ -80,10 +80,10 @@ Map result = act("request", null, parameters); assertNotNull("Test if resource exists", result); - assertEquals("Test for parameter", "test.xml?abc=def&ghi=jkl", (String)result.get("requestURI")); - assertEquals("Test for parameter", "?abc=def&ghi=jkl", (String)result.get("requestQuery")); - assertEquals("Test for parameter", "servlet", (String)result.get("context")); - assertEquals("Test for parameter", "def", (String)result.get("abc")); - assertNull("Test for parameter", (String)result.get("ghi")); + assertEquals("Test for parameter", "test.xml?abc=def&ghi=jkl", result.get("requestURI")); + assertEquals("Test for parameter", "?abc=def&ghi=jkl", result.get("requestQuery")); + assertEquals("Test for parameter", "servlet", result.get("context")); + assertEquals("Test for parameter", "def", result.get("abc")); + assertNull("Test for parameter", result.get("ghi")); } } 1.9 +3 -3 cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java Index: ResolverImplTestCase.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ResolverImplTestCase.java 9 Oct 2003 12:01:08 -0000 1.8 +++ ResolverImplTestCase.java 15 Oct 2003 21:00:24 -0000 1.9 @@ -230,7 +230,7 @@ "<!ENTITY nbsp \" \" ><!--=no break (required) space-->\n" + "<!ENTITY shy \"­\" ><!--=soft hyphen-->\n" + ""; - private DefaultContext context; + //private DefaultContext context; private EntityResolver resolverImpl; private File workDir; private File commandlineContextDir; @@ -434,7 +434,7 @@ * @since */ protected void addContext(DefaultContext context) { - this.context = context; + //this.context = context; context.put(Constants.CONTEXT_WORK_DIR, workDir); 1.8 +2 -2 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AbstractCompositeTestCase.java 2 Sep 2003 08:51:23 -0000 1.7 +++ AbstractCompositeTestCase.java 15 Oct 2003 21:00:24 -0000 1.8 @@ -409,7 +409,7 @@ } public final void print(Document document) { - TransformerFactory factory = (TransformerFactory) TransformerFactory.newInstance(); + TransformerFactory factory = TransformerFactory.newInstance(); try { javax.xml.transform.Transformer serializer = factory.newTransformer(); 1.8 +0 -2 cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRequest.java Index: MockRequest.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRequest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- MockRequest.java 18 Jul 2003 20:58:06 -0000 1.7 +++ MockRequest.java 15 Oct 2003 21:00:24 -0000 1.8 @@ -73,7 +73,6 @@ private String scheme; private String protocol = "HTTP/1.1"; private String requestURI; - private String requestURL; private String contextPath = ""; private String servletPath; private String pathInfo; @@ -345,7 +344,6 @@ scheme = null; protocol = "HTTP/1.1"; requestURI = null; - requestURL = null; contextPath = null; servletPath = null; pathInfo = null; 1.6 +2 -2 cocoon-2.1/src/test/org/apache/cocoon/xml/dom/DOMBuilderStreamerTestCase.java Index: DOMBuilderStreamerTestCase.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/xml/dom/DOMBuilderStreamerTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DOMBuilderStreamerTestCase.java 10 Jul 2003 00:25:26 -0000 1.5 +++ DOMBuilderStreamerTestCase.java 15 Oct 2003 21:00:24 -0000 1.6 @@ -205,7 +205,7 @@ } public final void print(Document document) { - TransformerFactory factory = (TransformerFactory) TransformerFactory.newInstance(); + TransformerFactory factory = TransformerFactory.newInstance(); try { javax.xml.transform.Transformer serializer = factory.newTransformer(); 1.8 +2 -2 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AbstractTransformerTestCase.java 10 Jul 2003 00:25:25 -0000 1.7 +++ AbstractTransformerTestCase.java 15 Oct 2003 21:00:24 -0000 1.8 @@ -182,7 +182,7 @@ } public final void print(Document document) { - TransformerFactory factory = (TransformerFactory) TransformerFactory.newInstance(); + TransformerFactory factory = TransformerFactory.newInstance(); try { javax.xml.transform.Transformer serializer = factory.newTransformer();