Author: olamy
Date: Sun Jul 18 21:03:56 2010
New Revision: 965286
URL: http://svn.apache.org/viewvc?rev=965286&view=rev
Log:
[SCM-562] fix junits
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java?rev=965286&r1=965285&r2=965286&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
Sun Jul 18 21:03:56 2010
@@ -38,14 +38,14 @@ public class SvnCommandLineUtilsTest
new SvnScmProviderRepository(
"https://svn.apache.org/repos/asf/maven/scm/trunk";, "username", "password" );
String clString =
SvnCommandLineUtils.cryptPassword(
SvnCommandLineUtils.getBaseSvnCommandLine( new File( "." ), repo ) );
- Commandline expectedCmd = new Commandline( "svn --username username
--password ***** --non-interactive" );
+ Commandline expectedCmd = new Commandline( "svn --username username
--password ***** --no-auth-cache --non-interactive" );
expectedCmd.setWorkingDirectory( new File( "." ).getAbsolutePath() );
assertEquals( expectedCmd.toString(), clString );
repo = new SvnScmProviderRepository(
"https://svn.apache.org/repos/asf/maven/scm/trunk";, "username", null );
clString =
SvnCommandLineUtils.cryptPassword(
SvnCommandLineUtils.getBaseSvnCommandLine( new File( "." ), repo ) );
- assertCommandLine( "svn --username username --non-interactive", new
File( "." ),
+ assertCommandLine( "svn --username username --no-auth-cache
--non-interactive", new File( "." ),
SvnCommandLineUtils.getBaseSvnCommandLine( new
File( "." ), repo ) );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java?rev=965286&r1=965285&r2=965286&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
Sun Jul 18 21:03:56 2010
@@ -70,14 +70,14 @@ public class SvnCheckInCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
- "svn --username anonymous --non-interactive commit "
+ messageFileString );
+ "svn --username anonymous --no-auth-cache
--non-interactive commit " + messageFileString );
}
public void testCommandLineWithUsernameAndTag()
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
- "svn --username anonymous --non-interactive commit "
+ messageFileString );
+ "svn --username anonymous --no-auth-cache
--non-interactive commit " + messageFileString );
}
public void testCommandLineWithUsernameWithoutNonInteractive()
@@ -86,7 +86,7 @@ public class SvnCheckInCommandTest
try
{
SvnUtil.setSettingsDirectory( getTestFile(
"src/test/resources/svn/checkin/macos" ) );
- testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
"svn --username anonymous commit "
+ testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
"svn --username anonymous --no-auth-cache commit "
+ messageFileString );
}
finally
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java?rev=965286&r1=965285&r2=965286&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommandTest.java
Sun Jul 18 21:03:56 2010
@@ -57,14 +57,14 @@ public class SvnListCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, false,
"10",
- "svn --username anonymous --non-interactive list -r
10" );
+ "svn --username anonymous --no-auth-cache
--non-interactive list -r 10" );
}
public void testCommandLineWithUsernameAndTag()
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, false,
"10",
- "svn --username anonymous --non-interactive list -r
10" );
+ "svn --username anonymous --no-auth-cache
--non-interactive list -r 10" );
}
// ----------------------------------------------------------------------
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java?rev=965286&r1=965285&r2=965286&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
Sun Jul 18 21:03:56 2010
@@ -75,7 +75,7 @@ public class SvnMkdirCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";,
- "svn --username anonymous --non-interactive mkdir
http://foo.com/svn/trunk/missing " +
+ "svn --username anonymous --no-auth-cache
--non-interactive mkdir http://foo.com/svn/trunk/missing " +
messageFileString, false );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java?rev=965286&r1=965285&r2=965286&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
Sun Jul 18 21:03:56 2010
@@ -92,7 +92,7 @@ public class SvnUpdateCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, new
ScmRevision( "10" ),
- "svn --username anonymous --non-interactive update -r
10 " +
+ "svn --username anonymous --no-auth-cache
--non-interactive update -r 10 " +
getUpdateTestFile().getAbsolutePath() );
}
@@ -100,7 +100,7 @@ public class SvnUpdateCommandTest
throws Exception
{
testCommandLine( "scm:svn:http://anonym...@foo.com/svn/trunk";, new
ScmRevision( "10" ),
- "svn --username anonymous --non-interactive update -r
10 " +
+ "svn --username anonymous --no-auth-cache
--non-interactive update -r 10 " +
getUpdateTestFile().getAbsolutePath() );
}
