You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2009/04/30 11:26:19 UTC
svn commit: r770127 - in
/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax:
betwixt/BetwixtBeanGeneratorTest.java fop/FopSerializerTestCase.java
neko/NekoGeneratorTestCase.java
Author: stevendolg
Date: Thu Apr 30 09:26:19 2009
New Revision: 770127
URL: http://svn.apache.org/viewvc?rev=770127&view=rev
Log:
Added the missing generic types to eliminate warnings in the unit tests.
Modified:
cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java
cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java
cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java?rev=770127&r1=770126&r2=770127&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java Thu Apr 30 09:26:19 2009
@@ -16,13 +16,14 @@
*/
package org.apache.cocoon.optional.pipeline.components.sax.betwixt;
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
-import org.apache.cocoon.optional.pipeline.components.sax.betwixt.BetwixtBeanGenerator;
import org.apache.cocoon.pipeline.NonCachingPipeline;
import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.pipeline.component.PipelineComponent;
+import org.apache.cocoon.sax.SAXPipelineComponent;
import org.apache.cocoon.sax.component.XMLSerializer;
import org.apache.commons.betwixt.BindingConfiguration;
import org.apache.commons.betwixt.IntrospectionConfiguration;
@@ -36,7 +37,7 @@
public void testPipelineWithBeanGenerator() throws Exception {
Animal animal = new Animal(5, "Dook", "albino", "Mustela putoris furo", "Lector");
- Pipeline pipeline = new NonCachingPipeline();
+ Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
pipeline.addComponent(new BetwixtBeanGenerator(animal));
pipeline.addComponent(new XMLSerializer());
@@ -61,7 +62,7 @@
IntrospectionConfiguration configuration = xmlIntrospector.getConfiguration();
configuration.setAttributesForPrimitives(true);
- Pipeline pipeline = new NonCachingPipeline();
+ Pipeline<PipelineComponent> pipeline = new NonCachingPipeline<PipelineComponent>();
pipeline.addComponent(new BetwixtBeanGenerator(animal, bindingConfiguration, xmlIntrospector));
pipeline.addComponent(new XMLSerializer());
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java?rev=770127&r1=770126&r2=770127&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java Thu Apr 30 09:26:19 2009
@@ -16,7 +16,7 @@
*/
package org.apache.cocoon.optional.pipeline.components.sax.fop;
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -24,6 +24,7 @@
import org.apache.cocoon.pipeline.NonCachingPipeline;
import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.sax.SAXPipelineComponent;
import org.apache.cocoon.sax.component.FileGenerator;
import org.apache.cocoon.sax.component.XSLTTransformer;
import org.apache.commons.io.IOUtils;
@@ -33,7 +34,7 @@
@Test
public void testPipelineWithFOPSerializer() throws Exception {
- Pipeline pipeline = new NonCachingPipeline();
+ Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
pipeline.addComponent(new FileGenerator(this.getClass().getResource("page.xml")));
pipeline.addComponent(new XSLTTransformer(this.getClass().getResource("page2fo.xsl")));
pipeline.addComponent(new FopSerializer());
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java?rev=770127&r1=770126&r2=770127&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java Thu Apr 30 09:26:19 2009
@@ -16,12 +16,13 @@
*/
package org.apache.cocoon.optional.pipeline.components.sax.neko;
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.custommonkey.xmlunit.XMLAssert.assertNodeTestPasses;
import java.io.ByteArrayOutputStream;
import org.apache.cocoon.pipeline.NonCachingPipeline;
import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.sax.SAXPipelineComponent;
import org.apache.cocoon.sax.component.XMLSerializer;
import org.custommonkey.xmlunit.examples.CountingNodeTester;
import org.junit.Test;
@@ -31,7 +32,7 @@
@Test
public void testPipelineWithNekoGenerator() throws Exception {
- Pipeline pipeline = new NonCachingPipeline();
+ Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
pipeline.addComponent(new NekoGenerator(this.getClass().getResource("sample.html")));
pipeline.addComponent(new XMLSerializer());