You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/11/28 21:56:27 UTC

maven-wagon git commit: simplified code and improved tests output

Repository: maven-wagon
Updated Branches:
  refs/heads/master 38934e78d -> 2f3543fa9


simplified code and improved tests output

Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/2f3543fa
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/2f3543fa
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/2f3543fa

Branch: refs/heads/master
Commit: 2f3543fa94d64513157d7f68c880dd8c68de3ba3
Parents: 38934e7
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Nov 28 21:56:18 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri Nov 28 21:56:18 2014 +0100

----------------------------------------------------------------------
 .../maven/wagon/http/HttpWagonTestCase.java     | 46 ++++++++++----------
 1 file changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2f3543fa/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index 0c05ccd..45bed80 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -647,10 +647,8 @@ public abstract class HttpWagonTestCase
             String found = FileUtils.fileRead( tmpResult );
             assertEquals( "found:'" + found + "'", "Hello, World!", found );
 
-            assertEquals( 1, handler.handlerRequestResponses.size() );
-            assertEquals( 200, handler.handlerRequestResponses.get( 0 ).responseCode );
-            assertEquals( 1, redirectHandler.handlerRequestResponses.size() );
-            assertEquals( 302, redirectHandler.handlerRequestResponses.get( 0 ).responseCode );
+            checkHandlerResult( handler.handlerRequestResponses, 200 );
+            checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
         }
         finally
         {
@@ -709,10 +707,8 @@ public abstract class HttpWagonTestCase
             String found = FileUtils.fileRead( tmpResult );
             assertEquals( "found:'" + found + "'", "Hello, World!", found );
 
-            assertEquals( 1, handler.handlerRequestResponses.size() );
-            assertEquals( 200, handler.handlerRequestResponses.get( 0 ).responseCode );
-            assertEquals( 1, redirectHandler.handlerRequestResponses.size() );
-            assertEquals( 302, redirectHandler.handlerRequestResponses.get( 0 ).responseCode );
+            checkHandlerResult( handler.handlerRequestResponses, 200 );
+            checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
         }
         finally
         {
@@ -808,13 +804,8 @@ public abstract class HttpWagonTestCase
     protected void checkRequestResponseForRedirectPutFromStreamWithFullUrl( PutHandler putHandler,
                                                                             RedirectHandler redirectHandler )
     {
-        assertEquals( "found:" + putHandler.handlerRequestResponses, 1, putHandler.handlerRequestResponses.size() );
-        assertEquals( "found:" + putHandler.handlerRequestResponses, 201,
-                      putHandler.handlerRequestResponses.get( 0 ).responseCode );
-        assertEquals( "found:" + redirectHandler.handlerRequestResponses, 1,
-                      redirectHandler.handlerRequestResponses.size() );
-        assertEquals( "found:" + redirectHandler.handlerRequestResponses, 302,
-                      redirectHandler.handlerRequestResponses.get( 0 ).responseCode );
+        checkHandlerResult( putHandler.handlerRequestResponses, 201 );
+        checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
     }
 
     public void testRedirectPutFromStreamRelativeUrl()
@@ -885,15 +876,26 @@ public abstract class HttpWagonTestCase
     protected void checkRequestResponseForRedirectPutFromStreamWithRelativeUrl( PutHandler putHandler,
                                                                                 RedirectHandler redirectHandler )
     {
-        assertEquals( "found:" + putHandler.handlerRequestResponses, 0, putHandler.handlerRequestResponses.size() );
+        checkHandlerResult( putHandler.handlerRequestResponses );
+        checkHandlerResult( redirectHandler.handlerRequestResponses, 302, 201 );
+    }
 
-        assertEquals( "found:" + redirectHandler.handlerRequestResponses, 2,
-                      redirectHandler.handlerRequestResponses.size() );
-        assertEquals( "found:" + redirectHandler.handlerRequestResponses, 302,
-                      redirectHandler.handlerRequestResponses.get( 0 ).responseCode );
-        assertEquals( "found:" + redirectHandler.handlerRequestResponses, 201,
-                      redirectHandler.handlerRequestResponses.get( 1 ).responseCode );
+    protected void checkHandlerResult( List<HandlerRequestResponse> handlerRequestResponses,
+                                       int... expectedResponseCodes )
+    {
+        boolean success = true;
+        if ( handlerRequestResponses.size() == expectedResponseCodes.length )
+        {
+            for ( int i = 0; i < expectedResponseCodes.length; i++ )
+            {
+                success &= ( expectedResponseCodes[i] == handlerRequestResponses.get( i ).responseCode );
+            }
+        }
 
+        if ( !success )
+        {
+            fail( "expected " + expectedResponseCodes + ", got " + handlerRequestResponses );
+        }
     }
 
     public void testRedirectPutFileWithFullUrl()