You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by ck...@apache.org on 2010/05/16 02:35:03 UTC

svn commit: r944747 - in /abdera/java/trunk: dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/ parser/src/test/java/org/apache/abdera/test/parser/ parser/src/test/java/org/apache/abdera/test/parser/stax/

Author: ckoppelt
Date: Sun May 16 00:35:02 2010
New Revision: 944747

URL: http://svn.apache.org/viewvc?rev=944747&view=rev
Log:
replaced all occurences of 'extends Assert' with static imports

Modified:
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestBase.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIDNA.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIO.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIRI.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestLang.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNFKC.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNameprep.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestPunycode.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestTemplate.java
    abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestText.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/EncodingTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/ServiceDocumentTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ConcurrencyTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/EntryLinkTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ParserTest.java
    abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/XhtmlTest.java

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestBase.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestBase.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestBase.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestBase.java Sun May 16 00:35:02 2010
@@ -17,9 +17,8 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
-import junit.framework.Assert;
 
-public abstract class TestBase extends Assert {
+public abstract class TestBase {
 
   protected static String string(int... chars) {
     try {

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIDNA.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIDNA.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIDNA.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIDNA.java Sun May 16 00:35:02 2010
@@ -17,6 +17,8 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertTrue;
+
 import org.apache.abdera.i18n.iri.IDNA;
 import org.junit.Test;
 

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIO.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIO.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIO.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIO.java Sun May 16 00:35:02 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIRI.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIRI.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIRI.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestIRI.java Sun May 16 00:35:02 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
 import java.net.URI;
 
 import org.apache.abdera.i18n.iri.IRI;

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestLang.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestLang.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestLang.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestLang.java Sun May 16 00:35:02 2010
@@ -17,6 +17,12 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Locale;
 
 import org.apache.abdera.i18n.rfc4646.Lang;

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNFKC.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNFKC.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNFKC.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNFKC.java Sun May 16 00:35:02 2010
@@ -17,6 +17,8 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.abdera.i18n.text.Normalizer;
 import org.junit.Test;
 

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNameprep.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNameprep.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNameprep.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestNameprep.java Sun May 16 00:35:02 2010
@@ -17,6 +17,9 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.apache.abdera.i18n.text.CharUtils;
 import org.apache.abdera.i18n.text.Nameprep;
 

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestPunycode.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestPunycode.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestPunycode.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestPunycode.java Sun May 16 00:35:02 2010
@@ -17,6 +17,8 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.fail;
+
 import org.apache.abdera.i18n.text.Punycode;
 
 public class TestPunycode extends TestBase {

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestTemplate.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestTemplate.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestTemplate.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestTemplate.java Sun May 16 00:35:02 2010
@@ -17,6 +17,8 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 import java.util.HashMap;

Modified: abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestText.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestText.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestText.java (original)
+++ abdera/java/trunk/dependencies/i18n/src/test/java/org/apache/abdera/i18n/test/iri/TestText.java Sun May 16 00:35:02 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.i18n.test.iri;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.abdera.i18n.text.CharUtils;
 import org.apache.abdera.i18n.text.Codepoint;
 import org.apache.abdera.i18n.text.CodepointIterator;

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/EncodingTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/EncodingTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/EncodingTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/EncodingTest.java Sun May 16 00:35:02 2010
@@ -17,14 +17,15 @@
 */
 package org.apache.abdera.test.parser;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.util.Date;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.i18n.text.io.CompressionUtil;
 import org.apache.abdera.i18n.text.io.CompressionUtil.CompressionCodec;
@@ -37,7 +38,7 @@ import org.apache.abdera.parser.ParserOp
 import org.apache.abdera.writer.WriterOptions;
 import org.junit.Test;
 
-public class EncodingTest extends Assert {
+public class EncodingTest {
     
   @Test
     public void testContentEncoding() throws Exception {

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/ServiceDocumentTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/ServiceDocumentTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/ServiceDocumentTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/ServiceDocumentTest.java Sun May 16 00:35:02 2010
@@ -17,9 +17,9 @@
 */
 package org.apache.abdera.test.parser;
 
-import java.io.StringWriter;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.Assert;
+import java.io.StringWriter;
 
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 
 
-public class ServiceDocumentTest extends Assert {
+public class ServiceDocumentTest {
 
     /**
      * Test whether the Service Document includes <accept> for collections.

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java Sun May 16 00:35:02 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.test.parser.stax;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.List;
 
 import javax.xml.namespace.QName;

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java Sun May 16 00:35:02 2010
@@ -19,15 +19,13 @@ package org.apache.abdera.test.parser.st
 
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.parser.Parser;
 
-public abstract class BaseParserTestCase extends Assert {
+public abstract class BaseParserTestCase {
 
   private static Abdera abdera = new Abdera();
   

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ConcurrencyTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ConcurrencyTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ConcurrencyTest.java Sun May 16 00:35:02 2010
@@ -17,9 +17,9 @@
  */
 package org.apache.abdera.test.parser.stax;
 
-import java.io.InputStream;
+import static org.junit.Assert.fail;
 
-import junit.framework.Assert;
+import java.io.InputStream;
 
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Content;
@@ -34,7 +34,7 @@ import org.junit.Test;
  * 
  * @version $Id$
  */
-public class ConcurrencyTest extends Assert {
+public class ConcurrencyTest {
 
   private static final int N_THREADS = 100;
 

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/EntryLinkTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/EntryLinkTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/EntryLinkTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/EntryLinkTest.java Sun May 16 00:35:02 2010
@@ -17,7 +17,7 @@
 */
 package org.apache.abdera.test.parser.stax;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertNotNull;
 
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 
 
-public class EntryLinkTest extends Assert {
+public class EntryLinkTest {
 
     /**
      * Link in entry disappears after adding entry to a feed.

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java Sun May 16 00:35:02 2010
@@ -17,6 +17,11 @@
 */
 package org.apache.abdera.test.parser.stax;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -33,8 +38,6 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.filter.ListParseFilter;
@@ -73,7 +76,7 @@ import org.apache.abdera.xpath.XPath;
 import org.apache.axiom.attachments.ByteArrayDataSource;
 import org.junit.Test;
 
-public class FOMTest extends Assert   {
+public class FOMTest {
 
   private static Abdera abdera = new Abdera();
   

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java Sun May 16 00:35:02 2010
@@ -17,6 +17,9 @@
 */
 package org.apache.abdera.test.parser.stax;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java Sun May 16 00:35:02 2010
@@ -17,6 +17,12 @@
 */
 package org.apache.abdera.test.parser.stax;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -46,7 +52,6 @@ import org.apache.abdera.model.Text;
 import org.apache.abdera.util.MimeTypeParseException;
 import org.apache.axiom.om.OMException;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 //@Ignore("ABDERA-256")

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ParserTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ParserTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ParserTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/ParserTest.java Sun May 16 00:35:02 2010
@@ -17,12 +17,13 @@
 */
 package org.apache.abdera.test.parser.stax;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Entry;
@@ -31,7 +32,7 @@ import org.apache.abdera.model.Service;
 import org.apache.abdera.parser.Parser;
 import org.junit.Test;
 
-public class ParserTest extends Assert {
+public class ParserTest {
 
   private static Abdera abdera = new Abdera();
   

Modified: abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/XhtmlTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/XhtmlTest.java?rev=944747&r1=944746&r2=944747&view=diff
==============================================================================
--- abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/XhtmlTest.java (original)
+++ abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/XhtmlTest.java Sun May 16 00:35:02 2010
@@ -17,7 +17,9 @@
 */
 package org.apache.abdera.test.parser.stax;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Content;
@@ -26,7 +28,7 @@ import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Entry;
 import org.junit.Test;
 
-public class XhtmlTest extends Assert {
+public class XhtmlTest {
  
   @Test
   public void testXhtml() throws Exception {