You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2010/06/14 12:15:27 UTC
svn commit: r954401 - in /httpcomponents/httpcore/trunk/httpcore: ./ src/test/java/org/apache/http/mockup/ src/test/java/org/apache/http/protocol/

Author: sebb
Date: Mon Jun 14 10:15:27 2010
New Revision: 954401

URL: http://svn.apache.org/viewvc?rev=954401&view=rev
Log:
Rename Test*.java files that don't contain tests

Added:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpClient.java
      - copied, changed from r954153, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpServer.java
      - copied, changed from r954153, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpServer.java
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpServer.java
Modified:
    httpcomponents/httpcore/trunk/httpcore/pom.xml
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java

Modified: httpcomponents/httpcore/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/pom.xml?rev=954401&r1=954400&r2=954401&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore/pom.xml Mon Jun 14 10:15:27 2010
@@ -122,12 +122,6 @@
         <version>${httpcore.surefire.version}</version>
         <configuration>
           <jvm>${httpcore.surefire.java}</jvm>
-          <excludes>
-            <exclude>**/*$*</exclude><!-- Re-specify the default, i.e. inner classes -->
-            <!-- These classes don't have any tests. They are ignored by JUnit 3.8, but not by JUnit 4.x -->
-            <exclude>org/apache/http/mockup/TestHttpServer.java</exclude>
-            <exclude>org/apache/http/mockup/TestHttpClient.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpClient.java (from r954153, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpClient.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpClient.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpClient.java&r1=954153&r2=954401&rev=954401&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpClient.java Mon Jun 14 10:15:27 2010
@@ -55,7 +55,7 @@ import org.apache.http.protocol.RequestE
 import org.apache.http.protocol.RequestTargetHost;
 import org.apache.http.protocol.RequestUserAgent;
 
-public class TestHttpClient {
+public class HttpClient {
 
     private final HttpParams params;
     private final HttpProcessor httpproc;
@@ -63,7 +63,7 @@ public class TestHttpClient {
     private final ConnectionReuseStrategy connStrategy;
     private final HttpContext context;
 
-    public TestHttpClient() {
+    public HttpClient() {
         super();
         this.params = new SyncBasicHttpParams();
         this.params

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpServer.java (from r954153, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpServer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpServer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpServer.java&r1=954153&r2=954401&rev=954401&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TestHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpServer.java Mon Jun 14 10:15:27 2010
@@ -59,7 +59,7 @@ import org.apache.http.protocol.Response
 import org.apache.http.protocol.ResponseDate;
 import org.apache.http.protocol.ResponseServer;
 
-public class TestHttpServer {
+public class HttpServer {
 
     private final HttpParams params;
     private final HttpProcessor httpproc;
@@ -73,7 +73,7 @@ public class TestHttpServer {
     private Thread listener;
     private volatile boolean shutdown;
 
-    public TestHttpServer() throws IOException {
+    public HttpServer() throws IOException {
         super();
         this.params = new SyncBasicHttpParams();
         this.params

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java?rev=954401&r1=954400&r2=954401&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java Mon Jun 14 10:15:27 2010
@@ -55,8 +55,8 @@ import org.apache.http.entity.StringEnti
 import org.apache.http.impl.DefaultHttpClientConnection;
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.mockup.TestHttpClient;
-import org.apache.http.mockup.TestHttpServer;
+import org.apache.http.mockup.HttpClient;
+import org.apache.http.mockup.HttpServer;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.util.EncodingUtils;
 import org.apache.http.util.EntityUtils;
@@ -72,12 +72,12 @@ public class TestHttpServiceAndExecutor 
 
     // ------------------------------------------------------- TestCase Methods
 
-    private TestHttpServer server;
-    private TestHttpClient client;
+    private HttpServer server;
+    private HttpClient client;
 
     protected void setUp() throws Exception {
-        this.server = new TestHttpServer();
-        this.client = new TestHttpClient();
+        this.server = new HttpServer();
+        this.client = new HttpClient();
     }
 
     protected void tearDown() throws Exception {