abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckopp...@apache.org
Subject svn commit: r944748 - in /abdera/java/trunk: adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/ adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/ client/src/test/java/org/apache/abdera/test...
Date Sun, 16 May 2010 00:38:52 GMT
Author: ckoppelt
Date: Sun May 16 00:38:52 2010
New Revision: 944748

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

Modified:
    abdera/java/trunk/adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/CouchDbTest.java
    abdera/java/trunk/adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/FilesystemTest.java
    abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
    abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/cache/CacheTest.java
    abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/util/MultipartRelatedRequestEntityTest.java
    abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/DigitalSignatureTest.java
    abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/EncryptionTest.java
    abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/filter/SecurityFilterTest.java
    abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
    abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
    abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
    abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/multipart/MultipartRelatedTest.java
    abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/route/RouteTest.java

Modified: abdera/java/trunk/adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/CouchDbTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/CouchDbTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/CouchDbTest.java
(original)
+++ abdera/java/trunk/adapters/couchdb/src/test/java/org/apache/abdera/protocol/server/test/couchdb/CouchDbTest.java
Sun May 16 00:38:52 2010
@@ -17,17 +17,18 @@
 */
 package org.apache.abdera.protocol.server.test.couchdb;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Date;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Base;
 import org.apache.abdera.model.Collection;
 import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Service;
@@ -52,7 +53,7 @@ import org.mortbay.jetty.servlet.Context
 import org.mortbay.jetty.servlet.ServletHolder;
 
 @Ignore
-public class CouchDbTest extends Assert {
+public class CouchDbTest {
 
   private static Server server;
   private static Abdera abdera = Abdera.getInstance();

Modified: abdera/java/trunk/adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/FilesystemTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/FilesystemTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/FilesystemTest.java
(original)
+++ abdera/java/trunk/adapters/filesystem/src/test/java/org/apache/abdera/protocol/server/test/filesystem/FilesystemTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.protocol.server.test.filesystem;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Date;
@@ -51,7 +55,7 @@ import org.mortbay.jetty.servlet.Context
 import org.mortbay.jetty.servlet.ServletHolder;
 
 @Ignore
-public class FilesystemTest extends Assert {
+public class FilesystemTest {
 
   private static Server server;
   private static Abdera abdera = Abdera.getInstance();

Modified: abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
(original)
+++ abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,11 @@
 */
 package org.apache.abdera.test.client.app;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -59,7 +64,7 @@ import org.junit.Test;
  * Test to make sure that we can operate as a simple APP client
  */
 @SuppressWarnings("serial")
-public class AppTest extends Assert {
+public class AppTest {
   
   protected static void getServletHandler(String... servletMappings) {
     for (int n = 0; n < servletMappings.length; n = n + 2) {

Modified: abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/cache/CacheTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/cache/CacheTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/cache/CacheTest.java
(original)
+++ abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/cache/CacheTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,10 @@
 */
 package org.apache.abdera.test.client.cache;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -50,7 +54,7 @@ import org.junit.Test;
  * caches, etc) if you try to talk to a remote server.
  */
 @SuppressWarnings("serial")
-public class CacheTest extends Assert {
+public class CacheTest {
   
   private static String CHECK_CACHE_INVALIDATE;
   private static String CHECK_NO_CACHE;

Modified: abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/util/MultipartRelatedRequestEntityTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/util/MultipartRelatedRequestEntityTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/util/MultipartRelatedRequestEntityTest.java
(original)
+++ abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/util/MultipartRelatedRequestEntityTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,9 @@
 */
 package org.apache.abdera.test.client.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,10 +42,7 @@ import org.apache.commons.httpclient.met
 import org.junit.Test;
 import org.mortbay.io.WriterOutputStream;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
-public class MultipartRelatedRequestEntityTest extends Assert {
+public class MultipartRelatedRequestEntityTest {
 
 	@Test
 	public void testMultipartFormat() throws IOException {

Modified: abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/DigitalSignatureTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/DigitalSignatureTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/DigitalSignatureTest.java
(original)
+++ abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/DigitalSignatureTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,11 @@
 */
 package org.apache.abdera.test.security;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -26,8 +31,6 @@ import java.security.cert.X509Certificat
 
 import javax.xml.namespace.QName;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Document;
@@ -37,7 +40,7 @@ import org.apache.abdera.security.Signat
 import org.apache.abdera.security.SignatureOptions;
 import org.junit.Test;
 
-public class DigitalSignatureTest extends Assert {
+public class DigitalSignatureTest {
 
   private static final String keystoreFile = "/key.jks";
   private static final String keystoreType = "JKS";

Modified: abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/EncryptionTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/EncryptionTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/EncryptionTest.java
(original)
+++ abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/EncryptionTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,9 @@
 */
 package org.apache.abdera.test.security;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.security.Provider;
 import java.security.Security;
 
@@ -24,8 +27,6 @@ import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.xml.namespace.QName;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Document;
@@ -36,7 +37,7 @@ import org.apache.abdera.security.Encryp
 import org.junit.Test;
 
 @SuppressWarnings("unchecked")
-public class EncryptionTest extends Assert {
+public class EncryptionTest {
 
   /**
    * The bouncy castle JCE provider is required to run this test

Modified: abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/filter/SecurityFilterTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/filter/SecurityFilterTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/filter/SecurityFilterTest.java
(original)
+++ abdera/java/trunk/security/src/test/java/org/apache/abdera/test/security/filter/SecurityFilterTest.java
Sun May 16 00:38:52 2010
@@ -17,14 +17,16 @@
  */
 package org.apache.abdera.test.security.filter;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.InputStream;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.Date;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
@@ -40,8 +42,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class SecurityFilterTest 
-  extends Assert {
+public class SecurityFilterTest {
 
   private static JettyServer server;
   private static Abdera abdera = Abdera.getInstance();

Modified: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
(original)
+++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/basic/BasicTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,10 @@
  */
 package org.apache.abdera.protocol.server.test.basic;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Date;
@@ -45,7 +49,7 @@ import org.junit.Test;
 
 import junit.framework.Assert;
 
-public class BasicTest extends Assert {
+public class BasicTest {
 
   private static JettyServer server;
   private static Abdera abdera = Abdera.getInstance();

Modified: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
(original)
+++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/custom/CustomProviderTest.java
Sun May 16 00:38:52 2010
@@ -17,12 +17,15 @@
  */
 package org.apache.abdera.protocol.server.test.custom;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Date;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Base;
 import org.apache.abdera.model.Categories;
@@ -43,7 +46,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class CustomProviderTest extends Assert {
+public class CustomProviderTest {
 
   private static JettyServer server;
   private static Abdera abdera = Abdera.getInstance();

Modified: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
(original)
+++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/customer/CustomerAdapterTest.java
Sun May 16 00:38:52 2010
@@ -17,6 +17,10 @@
  */
 package org.apache.abdera.protocol.server.test.customer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.util.Date;
 
@@ -50,9 +54,7 @@ import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
 
-import junit.framework.Assert;
-
-public class CustomerAdapterTest extends Assert {
+public class CustomerAdapterTest {
 
   private Server server;
   private DefaultProvider customerProvider;

Modified: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/multipart/MultipartRelatedTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/multipart/MultipartRelatedTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/multipart/MultipartRelatedTest.java
(original)
+++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/multipart/MultipartRelatedTest.java
Sun May 16 00:38:52 2010
@@ -1,10 +1,11 @@
 package org.apache.abdera.protocol.server.test.multipart;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.StringWriter;
 import java.util.HashMap;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.i18n.iri.IRI;
@@ -25,7 +26,7 @@ import org.mortbay.jetty.servlet.Context
 import org.mortbay.jetty.servlet.ServletHolder;
 
 @SuppressWarnings("serial")
-public class MultipartRelatedTest extends Assert {
+public class MultipartRelatedTest {
 
 	private Server server;
 

Modified: abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/route/RouteTest.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/route/RouteTest.java?rev=944748&r1=944747&r2=944748&view=diff
==============================================================================
--- abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/route/RouteTest.java
(original)
+++ abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/test/route/RouteTest.java
Sun May 16 00:38:52 2010
@@ -20,22 +20,23 @@ package org.apache.abdera.protocol.serve
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.apache.abdera.i18n.templates.HashMapContext;
 import org.apache.abdera.i18n.templates.Route;
 import org.apache.abdera.protocol.server.RequestContext;
-import org.apache.abdera.protocol.server.Target;
 import org.apache.abdera.protocol.server.TargetType;
 import org.apache.abdera.protocol.server.impl.RouteManager;
 import org.apache.abdera.protocol.server.impl.RouteManager.RouteTarget;
 import org.junit.Test;
 
-public class RouteTest extends Assert {
+public class RouteTest {
   @Test
   public void testSimpleRoute() throws Exception {
     Route route = new Route("feed", "/:collection");



Mime
View raw message