svn commit: r1354458 - in /santuario/xml-security-java/trunk: ./ src/test/java/org/swssf/xmlsec/test/

[co...@apache.org]

Author: coheigea
Date: Wed Jun 27 12:29:28 2012
New Revision: 1354458

URL: http://svn.apache.org/viewvc?rev=1354458&view=rev
Log:
Fixed streaming tests

Modified:
    santuario/xml-security-java/trunk/pom.xml
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java
    santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java

Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Wed Jun 27 12:29:28 2012
@@ -368,7 +368,6 @@
         <junit.version>4.8.2</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <bcprov.version>1.46</bcprov.version>
-        <testng.version>6.5.2</testng.version>
         <xmlunit.version>1.3</xmlunit.version>
         <commons.codec.version>1.6</commons.codec.version>
         <commons.compress.version>1.4.1</commons.compress.version>
@@ -412,14 +411,6 @@
             <version>${log4j.version}</version>
             <scope>test</scope>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
-            <scope>test</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java Wed Jun 27 12:29:28 2012
@@ -18,12 +18,13 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_WithCommentsTransformer;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.CanonicalizerBase;
 import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
-import org.testng.annotations.Test;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
@@ -35,13 +36,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import static org.testng.Assert.*;
-
 /**
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class Canonicalizer11Test {
+public class Canonicalizer11Test extends org.junit.Assert {
 
     private XMLInputFactory xmlInputFactory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java Wed Jun 27 12:29:28 2012
@@ -18,12 +18,13 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer;
 import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
@@ -36,18 +37,15 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
 /**
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class Canonicalizer20010315ExclusiveTest {
+public class Canonicalizer20010315ExclusiveTest extends org.junit.Assert {
 
     private XMLInputFactory xmlInputFactory;
 
-    @BeforeMethod
+    @Before
     public void setUp() throws Exception {
         this.xmlInputFactory = XMLInputFactory.newInstance();
         this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java Wed Jun 27 12:29:28 2012
@@ -18,12 +18,13 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_OmitCommentsTransformer;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_WithCommentsTransformer;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.CanonicalizerBase;
 import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
-import org.testng.annotations.Test;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
@@ -35,13 +36,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import static org.testng.Assert.*;
-
 /**
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class Canonicalizer20010315Test {
+public class Canonicalizer20010315Test extends org.junit.Assert {
 
     private XMLInputFactory xmlInputFactory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java Wed Jun 27 12:29:28 2012
@@ -18,10 +18,11 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.impl.util.IVSplittingOutputStream;
 import org.swssf.xmlsec.impl.util.ReplaceableOuputStream;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -32,7 +33,7 @@ import java.io.ByteArrayOutputStream;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class IVSplittingOutputStreamTest {
+public class IVSplittingOutputStreamTest extends org.junit.Assert {
 
     private final String testString = "Within this class we test if the IVSplittingOutputStream works correctly under different conditions";
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java Wed Jun 27 12:29:28 2012
@@ -18,6 +18,9 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.InputProcessor;
 import org.swssf.xmlsec.ext.InputProcessorChain;
 import org.swssf.xmlsec.ext.XMLSecurityConstants;
@@ -25,8 +28,6 @@ import org.swssf.xmlsec.ext.XMLSecurityE
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.InputProcessorChainImpl;
 import org.swssf.xmlsec.impl.SecurityContextImpl;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import javax.xml.stream.XMLStreamException;
 import java.util.HashSet;
@@ -36,7 +37,7 @@ import java.util.Set;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class InputProcessorChainTest {
+public class InputProcessorChainTest extends org.junit.Assert {
 
     abstract class AbstractInputProcessor implements InputProcessor {
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java Wed Jun 27 12:29:28 2012
@@ -18,12 +18,13 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.*;
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.OutputProcessorChainImpl;
 import org.swssf.xmlsec.impl.SecurityContextImpl;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import javax.xml.stream.XMLStreamException;
 import java.util.HashSet;
@@ -33,7 +34,7 @@ import java.util.Set;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class OutputProcessorChainTest {
+public class OutputProcessorChainTest extends org.junit.Assert {
 
     abstract class AbstractOutputProcessor implements OutputProcessor {
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java Wed Jun 27 12:29:28 2012
@@ -18,15 +18,16 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.impl.util.RFC2253Parser;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 /**
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class RFC2253ParserTest {
+public class RFC2253ParserTest extends org.junit.Assert {
 
     @Test
     public void testToXML1() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java Wed Jun 27 12:29:28 2012
@@ -18,11 +18,12 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
 import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
@@ -30,8 +31,6 @@ import javax.xml.stream.XMLInputFactory;
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
 
-import static org.testng.Assert.assertEquals;
-
 /**
  * This is a test for Santuario-191:
  * <p/>
@@ -39,7 +38,7 @@ import static org.testng.Assert.assertEq
  * <p/>
  * An xml:Id attribute is appearing in a child element, contrary to the C14n11 spec.
  */
-public class Santuario191Test {
+public class Santuario191Test extends org.junit.Assert {
 
     private static final String INPUT_DATA =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -57,7 +56,7 @@ public class Santuario191Test {
 
     private XMLInputFactory xmlInputFactory;
 
-    @BeforeMethod
+    @Before
     public void setUp() throws Exception {
         this.xmlInputFactory = XMLInputFactory.newInstance();
         this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java Wed Jun 27 12:29:28 2012
@@ -18,9 +18,10 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.impl.util.TrimmerOutputStream;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayOutputStream;
 
@@ -28,7 +29,7 @@ import java.io.ByteArrayOutputStream;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class TrimmerOutputStreamTest {
+public class TrimmerOutputStreamTest extends org.junit.Assert {
 
     private final String testString = "Within this class we test if the TrimmerOutputStream works correctly under different conditions";
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java Wed Jun 27 12:29:28 2012
@@ -18,10 +18,11 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.config.Init;
 import org.swssf.xmlsec.ext.XMLSecurityException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.net.URL;
 
@@ -29,7 +30,7 @@ import java.net.URL;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class UncategorizedTest {
+public class UncategorizedTest extends org.junit.Assert {
 
     @Test
     public void testConfigurationLoadFromUrl() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java Wed Jun 27 12:29:28 2012
@@ -18,11 +18,12 @@
  */
 package org.swssf.xmlsec.test;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.ext.stax.XMLSecEventFactory;
 import org.swssf.xmlsec.impl.XMLSecurityEventReader;
-import org.testng.annotations.Test;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
@@ -35,7 +36,7 @@ import java.util.Deque;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class XMLSecurityEventReaderTest {
+public class XMLSecurityEventReaderTest extends org.junit.Assert {
 
     @Test
     public void testConformness() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java Wed Jun 27 12:29:28 2012
@@ -18,9 +18,10 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Test;
+
 import org.custommonkey.xmlunit.XMLAssert;
 import org.swssf.xmlsec.impl.XMLSecurityEventWriter;
-import org.testng.annotations.Test;
 
 import javax.xml.stream.*;
 import javax.xml.stream.events.XMLEvent;
@@ -30,7 +31,7 @@ import java.io.StringWriter;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class XMLSecurityEventWriterTest {
+public class XMLSecurityEventWriterTest extends org.junit.Assert {
 
     @Test
     public void testConformness() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java Wed Jun 27 12:29:28 2012
@@ -18,7 +18,9 @@
  */
 package org.swssf.xmlsec.test;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.custommonkey.xmlunit.XMLAssert;
 import org.swssf.xmlsec.ext.*;
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
@@ -27,7 +29,6 @@ import org.swssf.xmlsec.impl.DocumentCon
 import org.swssf.xmlsec.impl.InputProcessorChainImpl;
 import org.swssf.xmlsec.impl.SecurityContextImpl;
 import org.swssf.xmlsec.impl.XMLSecurityStreamReader;
-import org.testng.annotations.Test;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
@@ -47,7 +48,7 @@ import java.util.Set;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class XMLSecurityStreamReaderTest {
+public class XMLSecurityStreamReaderTest extends org.junit.Assert {
 
     @Test
     public void testPassThroughDocumentEvents() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java?rev=1354458&r1=1354457&r2=1354458&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java Wed Jun 27 12:29:28 2012
@@ -18,14 +18,15 @@
  */
 package org.swssf.xmlsec.test;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.custommonkey.xmlunit.XMLAssert;
 import org.swssf.xmlsec.ext.*;
 import org.swssf.xmlsec.ext.stax.XMLSecEvent;
 import org.swssf.xmlsec.impl.OutputProcessorChainImpl;
 import org.swssf.xmlsec.impl.SecurityContextImpl;
 import org.swssf.xmlsec.impl.XMLSecurityStreamWriter;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLEventWriter;
@@ -40,7 +41,7 @@ import java.util.*;
  * @author $Author$
  * @version $Revision$ $Date$
  */
-public class XMLSecurityStreamWriterTest {
+public class XMLSecurityStreamWriterTest extends org.junit.Assert {
 
     @Test
     public void testIdentityTransformResult() throws Exception {