git commit: improved expactations messages
Repository: maven-wagon
Updated Branches:
refs/heads/master 36db56c37 - 60b584c3b
improved expactations messages
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/60b584c3
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/60b584c3
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/60b584c3
Branch: refs/heads/master
Commit: 60b584c3bd3bd0187030192309f897c0505314b4
Parents: 36db56c
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Apr 20 09:35:03 2014 +0200
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Apr 20 09:35:03 2014 +0200
--
.../wagon/providers/webdav/WebDavWagonTest.java | 24 ++--
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/60b584c3/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
--
diff --git
a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
index 3f047b1..1bab212 100644
---
a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
+++
b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
@@ -420,14 +420,14 @@ public class WebDavWagonTest
{
if ( preemptive )
{
-assertEquals( testPreemptiveAuthenticationGet not 1 security
handler use + sh.handlerRequestResponses, 1,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthenticationGet preemptive=true:
expected 1 request, got
++ sh.handlerRequestResponses, 1,
sh.handlerRequestResponses.size() );
assertEquals( 200, sh.handlerRequestResponses.get( 0
).responseCode );
}
else
{
-assertEquals( testPreemptiveAuthenticationGet not 2 security
handler use + sh.handlerRequestResponses, 2,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthenticationGet preemptive=false:
expected 2 requests (401,200), got
++ sh.handlerRequestResponses, 2,
sh.handlerRequestResponses.size() );
assertEquals( 401, sh.handlerRequestResponses.get( 0
).responseCode );
assertEquals( 200, sh.handlerRequestResponses.get( 1
).responseCode );
}
@@ -437,14 +437,14 @@ public class WebDavWagonTest
{
if ( preemptive )
{
-assertEquals( testPreemptiveAuthenticationPut not 2 security
handler use + sh.handlerRequestResponses, 2,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthenticationPut preemptive=true:
expected 2 requests (200,.), got
++ sh.handlerRequestResponses, 2,
sh.handlerRequestResponses.size() );
assertEquals( 200, sh.handlerRequestResponses.get( 0
).responseCode );
}
else
{
-assertEquals( testPreemptiveAuthenticationPut not 3 security
handler use + sh.handlerRequestResponses, 3,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthenticationPut preemptive=false:
expected 3 requests (401,200,.), got
++ sh.handlerRequestResponses, 3,
sh.handlerRequestResponses.size() );
assertEquals( 401, sh.handlerRequestResponses.get( 0
).responseCode );
assertEquals( 200, sh.handlerRequestResponses.get( 1
).responseCode );
}
@@ -456,14 +456,14 @@ public class WebDavWagonTest
{
if ( preemptive )
{
-assertEquals( testPreemptiveAuthentication not 2 security handler
use + sh.handlerRequestResponses, 2,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthentication preemptive=false:
expected 2 requests (200,.), got
++ sh.handlerRequestResponses, 2,
sh.handlerRequestResponses.size() );
assertEquals( 200, sh.handlerRequestResponses.get( 0
).responseCode );
}
else
{
-assertEquals( testPreemptiveAuthentication not 3 security handler
use + sh.handlerRequestResponses, 3,
- sh.handlerRequestResponses.size() );
+assertEquals( testPreemptiveAuthentication preemptive=false:
expected 3 requests (401,200,200), got
++ sh.handlerRequestResponses, 3,
git commit: replaced deprecated StringOutputStream with ByteArrayOutputStream
Repository: maven-wagon
Updated Branches:
refs/heads/master 60b584c3b - 481b21d88
replaced deprecated StringOutputStream with ByteArrayOutputStream
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/481b21d8
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/481b21d8
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/481b21d8
Branch: refs/heads/master
Commit: 481b21d885cca8844a4daa31b2549fafec649f68
Parents: 60b584c
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Apr 20 09:46:48 2014 +0200
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Apr 20 09:46:48 2014 +0200
--
.../org/apache/maven/wagon/WagonTestCase.java | 1 -
.../maven/wagon/http/HttpWagonTestCase.java | 20 ++--
2 files changed, 10 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/481b21d8/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
--
diff --git
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index 3ca1f61..4a1a006 100644
---
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -42,7 +42,6 @@ import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
/**
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/481b21d8/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 4535e9f..b7432e3 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
@@ -32,7 +32,6 @@ import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringOutputStream;
import org.codehaus.plexus.util.StringUtils;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.HttpConnection;
@@ -53,6 +52,8 @@ import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -162,7 +163,7 @@ public abstract class HttpWagonTestCase
wagon.connect(
new Repository( id, getProtocol() + ://localhost: +
server.getConnectors()[0].getLocalPort() ) );
-wagon.getToStream( resource, new StringOutputStream() );
+wagon.getToStream( resource, new ByteArrayOutputStream() );
wagon.disconnect();
@@ -194,7 +195,7 @@ public abstract class HttpWagonTestCase
wagon.connect(
new Repository( id, getProtocol() + ://localhost: +
server.getConnectors()[0].getLocalPort() ) );
-wagon.getToStream( resource, new StringOutputStream() );
+wagon.getToStream( resource, new ByteArrayOutputStream() );
wagon.disconnect();
@@ -273,7 +274,7 @@ public abstract class HttpWagonTestCase
try
{
-wagon.getToStream( resource, new StringOutputStream() );
+wagon.getToStream( resource, new ByteArrayOutputStream() );
fail();
}
finally
@@ -958,10 +959,9 @@ public abstract class HttpWagonTestCase
wagon.connect( testRepository, proxyInfo );
-StringOutputStream out = new StringOutputStream();
try
{
-wagon.getToStream( test-proxied-resource, out );
+wagon.getToStream( test-proxied-resource, new
ByteArrayOutputStream() );
assertTrue( handler.headers.containsKey( Proxy-Connection )
);
}
@@ -1101,7 +1101,7 @@ public abstract class HttpWagonTestCase
wagon.connect( testRepository, authInfo );
-StringOutputStream out = new StringOutputStream();
+ByteArrayOutputStream out = new ByteArrayOutputStream();
try
{
wagon.getToStream( test-secured-resource, out );
@@
svn commit: r1588724 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer: ./ sink/
Author: hboutemy
Date: Sun Apr 20 08:13:14 2014
New Revision: 1588724
URL: http://svn.apache.org/r1588724
Log:
improved javadoc
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java?rev=1588724r1=1588723r2=1588724view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
Sun Apr 20 08:13:14 2014
@@ -52,7 +52,7 @@ public interface DocumentRenderer
String getOutputName();
/**
- * Return the RenderingContext.
+ * Return the RenderingContext of the document.
*
* @return RenderingContext.
*/
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java?rev=1588724r1=1588723r2=1588724view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
Sun Apr 20 08:13:14 2014
@@ -37,7 +37,7 @@ public class DoxiaDocumentRenderer
/**
* Constructor.
*
- * @param renderingContext the RenderingContext to use.
+ * @param renderingContext the document's RenderingContext to use.
*/
public DoxiaDocumentRenderer( RenderingContext renderingContext )
{
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java?rev=1588724r1=1588723r2=1588724view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java
Sun Apr 20 08:13:14 2014
@@ -22,7 +22,7 @@ package org.apache.maven.doxia.siterende
import java.io.File;
/**
- * Holds a small extra module reference in the list of added modules to the
rendering context.
+ * Holds an extra Doxia source module reference in the list of added modules
to the site rendering context.
*
* @author a href=mailto:br...@apache.org;Brett Porter/a
*/
@@ -41,7 +41,7 @@ class ModuleReference
/**
* pGetter for the field codeparserId/code./p
*
- * @return a {@link java.lang.String} object.
+ * @return Doxia parser id associated to this source module.
*/
public String getParserId()
{
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java?rev=1588724r1=1588723r2=1588724view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java
(original)
+++
svn commit: r1588746 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java test/java/org/apache/maven/plugins/enforcer/ReactorModuleC
Author: khmarbaise
Date: Sun Apr 20 12:19:41 2014
New Revision: 1588746
URL: http://svn.apache.org/r1588746
Log:
- Small code clean ups.
- Fixed typos.
- Added JavaDoc
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java?rev=1588746r1=1588745r2=1588746view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
Sun Apr 20 12:19:41 2014
@@ -277,6 +277,15 @@ public class ReactorModuleConvergence
return isGAPartOfTheReactor( dependency.getGroupId(),
dependency.getArtifactId(), sortedProjects );
}
+/**
+ * This will check if the given codegroupId/artifactId/code is part of
the
+ * current reactor.
+ *
+ * @param groupId The groupId
+ * @param artifactId The artifactId
+ * @param sortedProjects The list of projects within the reactor.
+ * @return true if the groupId/artifactId is part of the reactor false
otherwise.
+ */
private boolean isGAPartOfTheReactor( String groupId, String artifactId,
ListMavenProject sortedProjects )
{
boolean result = false;
@@ -309,6 +318,7 @@ public class ReactorModuleConvergence
logger.debug( Project: + mavenProject.getId() );
if ( !hasParent( mavenProject ) )
{
+//TODO: Should add an option to force having a parent?
if ( mavenProject.isExecutionRoot() )
{
logger.debug( The root does not need having a parent. );
@@ -324,6 +334,13 @@ public class ReactorModuleConvergence
return result;
}
+/**
+ * Convenience method to handle adding a dependency to the Map of List.
+ *
+ * @param result The result List which should be handled.
+ * @param project The MavenProject which will be added.
+ * @param dependency The dependency which will be added.
+ */
private void addDep( MapMavenProject, ListDependency result,
MavenProject project, Dependency dependency )
{
if ( result.containsKey( project ) )
@@ -346,7 +363,7 @@ public class ReactorModuleConvergence
/**
* Go through the list of modules in the builds and check if we have
dependencies. If yes we will check every
- * dependency based on groupId/artifactId if it belong to the multi module
build. In such a case it will be checked
+ * dependency based on groupId/artifactId if it belongs to the multi
module build. In such a case it will be checked
* if the version does fit the version in the rest of build.
*
* @param reactorVersion The version of the reactor.
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java?rev=1588746r1=1588745r2=1588746view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
Sun Apr 20 12:19:41 2014
@@ -86,9 +86,6 @@ public class ReactorModuleConvergenceTes
MavenProject mp2 = createProjectChild1( mp1 );
MavenProject mp3 = createProjectChild2( mp1 );
-assertTrue( mp2.getParent() == mp1 );
-assertTrue( mp3.getParent() == mp1 );
-
ListMavenProject theList = Arrays.asList( mp1, mp2, mp3 );
when( session.getSortedProjects() ).thenReturn( theList );
@@ -231,7 +228,7 @@ public class ReactorModuleConvergenceTes
MavenProject mp2 = createProjectChild1( mp1 );
Dependency goodDependency = createDependency( org.junit, junit,
2.0 );
-
+
Dependency wrongDepFromReactory = createDependency(
org.apache.enforcer, m2, 1.1-SNAPSHOT );
ListDependency depList = Arrays.asList( goodDependency,
wrongDepFromReactory );
when( mp2.getDependencies() ).thenReturn( depList );
svn commit: r1588784 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DefaultTestLogger.java
Author: khmarbaise Date: Sun Apr 20 15:24:22 2014 New Revision: 1588784 URL: http://svn.apache.org/r1588784 Log: - Removed unused class. Removed: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DefaultTestLogger.java
