You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/01/09 21:49:51 UTC
svn commit: r897538 [1/2] - in
/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm:
./ provider/accurev/ provider/accurev/cli/ provider/accurev/command/
provider/accurev/command/add/ provider/accurev/command/change...
Author: olamy
Date: Sat Jan 9 20:49:50 2010
New Revision: 897538
URL: http://svn.apache.org/viewvc?rev=897538&view=rev
Log:
code formatting (no code changed)
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/ScmFileMatcher.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevStatTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTest.java
maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccurevUpdateCommandTest.java
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/ScmFileMatcher.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/ScmFileMatcher.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/ScmFileMatcher.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/ScmFileMatcher.java Sat Jan 9 20:49:50 2010
@@ -13,7 +13,7 @@
* governing permissions and limitations under the License.
*/
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.hasItem;
import java.io.File;
import java.util.List;
@@ -22,38 +22,45 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
-public class ScmFileMatcher extends TypeSafeMatcher<ScmFile> {
-
- public static Matcher<ScmFile> scmFile(String fileName, ScmFileStatus status) {
- return new ScmFileMatcher(fileName, status);
+public class ScmFileMatcher
+ extends TypeSafeMatcher<ScmFile>
+{
+
+ public static Matcher<ScmFile> scmFile( String fileName, ScmFileStatus status )
+ {
+ return new ScmFileMatcher( fileName, status );
}
@SuppressWarnings("unchecked")
- public static void assertHasScmFile(List<?> actualFiles, String fileName, ScmFileStatus status) {
- org.junit.Assert.assertThat((List<ScmFile>) actualFiles, hasItem(scmFile(fileName, status)));
+ public static void assertHasScmFile( List<?> actualFiles, String fileName, ScmFileStatus status )
+ {
+ org.junit.Assert.assertThat( (List<ScmFile>) actualFiles, hasItem( scmFile( fileName, status ) ) );
}
private ScmFileStatus status;
private String filePath;
- public ScmFileMatcher(String filePath, ScmFileStatus status) {
- // Convert to OS specific path...
- this.filePath = new File(filePath).getPath();
- this.status = status;
+ public ScmFileMatcher( String filePath, ScmFileStatus status )
+ {
+ // Convert to OS specific path...
+ this.filePath = new File( filePath ).getPath();
+ this.status = status;
}
- public void describeTo(Description desc) {
- desc.appendValue("ScmFile [");
- desc.appendValue(filePath);
- desc.appendText(",");
- desc.appendValue(status);
- desc.appendValue("]");
+ public void describeTo( Description desc )
+ {
+ desc.appendValue( "ScmFile [" );
+ desc.appendValue( filePath );
+ desc.appendText( "," );
+ desc.appendValue( status );
+ desc.appendValue( "]" );
}
@Override
- public boolean matchesSafely(ScmFile scmFile) {
- return scmFile.getPath().equals(filePath) && scmFile.getStatus().equals(status);
+ public boolean matchesSafely( ScmFile scmFile )
+ {
+ return scmFile.getPath().equals( filePath ) && scmFile.getStatus().equals( status );
}
}
\ No newline at end of file
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,8 @@
* under the License.
*/
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
import java.io.File;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java Sat Jan 9 20:49:50 2010
@@ -19,9 +19,9 @@
* under the License.
*/
-import static org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepositoryMatcher.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepositoryMatcher.isRepo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
@@ -48,8 +48,8 @@
{
AccuRevScmProvider provider = new AccuRevScmProvider();
- AccuRevScmProviderRepository repository =
- (AccuRevScmProviderRepository) provider.makeProviderScmRepository( url, ':' );
+ AccuRevScmProviderRepository repository = (AccuRevScmProviderRepository) provider
+ .makeProviderScmRepository( url, ':' );
assertThat( repository,
isRepo( null, null, null, AccuRevScmProviderRepository.DEFAULT_PORT, expStream, expPath ) );
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java Sat Jan 9 20:49:50 2010
@@ -44,7 +44,7 @@
description.appendText( "adds " ).appendValueList( "", ", ", "", elements ).appendText( " to a collection" );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public Object invoke( Invocation invocation )
throws Throwable
{
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java Sat Jan 9 20:49:50 2010
@@ -51,7 +51,7 @@
description.appendText( "] into a map" );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public Object invoke( Invocation invocation )
throws Throwable
{
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java Sat Jan 9 20:49:50 2010
@@ -1,21 +1,29 @@
package org.apache.maven.scm.provider.accurev.cli;
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the
- * Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeTrue;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -41,369 +49,484 @@
import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
-public class AccuRevCommandLineTest extends ScmTestCase {
-
- public class AccuRevCommandLineTester extends AccuRevCommandLine {
-
- private BufferedReader stdinReader;
-
- private String response;
-
- public BufferedReader getStdinReader() {
- return stdinReader;
- }
-
- private ScmLogger initLog() throws Exception {
-
- return AccuRevJUnitUtil.getLogger(getContainer());
- }
-
- public AccuRevCommandLineTester() throws Exception {
- setLogger(initLog());
- }
-
- public AccuRevCommandLineTester(String host, int port) throws Exception {
- super(host, port);
- setLogger(initLog());
- }
-
- @Override
- protected int executeCommandLine(Commandline cl, InputStream stdin, CommandOutputConsumer stdout, StreamConsumer stderr)
- throws CommandLineException {
- if (stdin != null) {
- stdinReader = new BufferedReader(new InputStreamReader(stdin));
- } else {
- stdinReader = null;
- }
- try {
- if (response != null) {
- BufferedReader reader = new BufferedReader(new StringReader(response));
- String line = reader.readLine();
- while (line != null) {
- stdout.consumeLine(line);
- line = reader.readLine();
- }
- }
- } catch (IOException e) {
- throw new CommandLineException("Unexpected error", e);
- }
- return 0;
- }
-
- public void setResponse(String response) {
- this.response = response;
+public class AccuRevCommandLineTest
+ extends ScmTestCase
+{
+
+ public class AccuRevCommandLineTester
+ extends AccuRevCommandLine
+ {
+
+ private BufferedReader stdinReader;
+
+ private String response;
+
+ public BufferedReader getStdinReader()
+ {
+ return stdinReader;
+ }
+
+ private ScmLogger initLog()
+ throws Exception
+ {
+
+ return AccuRevJUnitUtil.getLogger( getContainer() );
+ }
+
+ public AccuRevCommandLineTester()
+ throws Exception
+ {
+ setLogger( initLog() );
+ }
+
+ public AccuRevCommandLineTester( String host, int port )
+ throws Exception
+ {
+ super( host, port );
+ setLogger( initLog() );
+ }
+
+ @Override
+ protected int executeCommandLine( Commandline cl, InputStream stdin, CommandOutputConsumer stdout,
+ StreamConsumer stderr )
+ throws CommandLineException
+ {
+ if ( stdin != null )
+ {
+ stdinReader = new BufferedReader( new InputStreamReader( stdin ) );
+ }
+ else
+ {
+ stdinReader = null;
+ }
+ try
+ {
+ if ( response != null )
+ {
+ BufferedReader reader = new BufferedReader( new StringReader( response ) );
+ String line = reader.readLine();
+ while ( line != null )
+ {
+ stdout.consumeLine( line );
+ line = reader.readLine();
+ }
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new CommandLineException( "Unexpected error", e );
+ }
+ return 0;
+ }
+
+ public void setResponse( String response )
+ {
+ this.response = response;
- }
+ }
}
@Before
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
}
@After
@Override
- public void tearDown() throws Exception {
- super.tearDown();
+ public void tearDown()
+ throws Exception
+ {
+ super.tearDown();
}
@Override
- protected InputStream getCustomConfiguration() throws Exception {
- return AccuRevJUnitUtil.getPlexusConfiguration();
+ protected InputStream getCustomConfiguration()
+ throws Exception
+ {
+ return AccuRevJUnitUtil.getPlexusConfiguration();
}
@Test
- public void testPromoteAll() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ public void testPromoteAll()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- assertThat(accuRevCL.promoteAll(new File("/my/workspace"), "cmt msg", new ArrayList<File>()), is(true));
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(new File("/my/workspace").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "promote", "-p", "-K", "-c", "cmt msg" }));
+ assertThat( accuRevCL.promoteAll( new File( "/my/workspace" ), "cmt msg", new ArrayList<File>() ), is( true ) );
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/my/workspace" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "promote", "-p", "-K", "-c", "cmt msg" } ) );
}
@Test
- public void testPromote() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- List<File> files = new ArrayList<File>();
- File testfile = new File("my/test/file");
- files.add(testfile);
+ public void testPromote()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ List<File> files = new ArrayList<File>();
+ File testfile = new File( "my/test/file" );
+ files.add( testfile );
- assertThat(accuRevCL.promote(new File("/my/workspace"), files, "cmt msg", new ArrayList<File>()), is(true));
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(new File("/my/workspace").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "promote", "-K", "-c", "cmt msg", testfile.getPath() }));
+ assertThat( accuRevCL.promote( new File( "/my/workspace" ), files, "cmt msg", new ArrayList<File>() ),
+ is( true ) );
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/my/workspace" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "promote", "-K", "-c", "cmt msg", testfile.getPath() } ) );
}
@Test
- public void testLogin() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.setResponse("Password: a124235bacc3ff");
- accuRevCL.setExecutable("accurev.exe");
- accuRevCL.login("aUser", "topSecret");
- Commandline lastCL = accuRevCL.getCommandline();
+ public void testLogin()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.setResponse( "Password: a124235bacc3ff" );
+ accuRevCL.setExecutable( "accurev.exe" );
+ accuRevCL.login( "aUser", "topSecret" );
+ Commandline lastCL = accuRevCL.getCommandline();
- if (Os.isFamily(Os.FAMILY_WINDOWS)) {
- assertThat(lastCL.getArguments(), is(new String[] { "login", "-A", "aUser", "topSecret" }));
- assertThat(accuRevCL.getStdinReader(), is(nullValue()));
- } else {
- assertThat(lastCL.getArguments(), is(new String[] { "login", "-A", "aUser" }));
- assertThat(accuRevCL.getStdinReader().readLine(), is("topSecret"));
- }
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ {
+ assertThat( lastCL.getArguments(), is( new String[] { "login", "-A", "aUser", "topSecret" } ) );
+ assertThat( accuRevCL.getStdinReader(), is( nullValue() ) );
+ }
+ else
+ {
+ assertThat( lastCL.getArguments(), is( new String[] { "login", "-A", "aUser" } ) );
+ assertThat( accuRevCL.getStdinReader().readLine(), is( "topSecret" ) );
+ }
- accuRevCL.info(null);
- assertThat(lastCL.getArguments(), is(new String[] { "info", "-A", "a124235bacc3ff" }));
+ accuRevCL.info( null );
+ assertThat( lastCL.getArguments(), is( new String[] { "info", "-A", "a124235bacc3ff" } ) );
- assumeTrue(!Os.isFamily(Os.FAMILY_WINDOWS));
+ assumeTrue( !Os.isFamily( Os.FAMILY_WINDOWS ) );
- accuRevCL.login("anOther", "opensaysme");
- assertThat(lastCL.getArguments(), is(new String[] { "login", "-A", "anOther" }));
- assertThat(accuRevCL.getStdinReader().readLine(), is("opensaysme"));
+ accuRevCL.login( "anOther", "opensaysme" );
+ assertThat( lastCL.getArguments(), is( new String[] { "login", "-A", "anOther" } ) );
+ assertThat( accuRevCL.getStdinReader().readLine(), is( "opensaysme" ) );
- accuRevCL.login("AUser", null);
- assertThat(lastCL.getArguments(), is(new String[] { "login", "-A", "AUser" }));
- assertThat(accuRevCL.getStdinReader().readLine(), is(""));
+ accuRevCL.login( "AUser", null );
+ assertThat( lastCL.getArguments(), is( new String[] { "login", "-A", "AUser" } ) );
+ assertThat( accuRevCL.getStdinReader().readLine(), is( "" ) );
}
@Test
- public void testPop() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester("aHost", 5051);
- accuRevCL.setExecutable("accurev.exe");
- File testfile = new File("/my/export");
- File projectDir = new File("/./project/dir");
- accuRevCL.pop(testfile, "stream/12", Collections.singleton(projectDir), new ArrayList<File>());
+ public void testPop()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester( "aHost", 5051 );
+ accuRevCL.setExecutable( "accurev.exe" );
+ File testfile = new File( "/my/export" );
+ File projectDir = new File( "/./project/dir" );
+ accuRevCL.pop( testfile, "stream/12", Collections.singleton( projectDir ), new ArrayList<File>() );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getExecutable(), is("accurev.exe"));
- assertThat(lastCL.getArguments(), is(new String[] { "pop", "-H", "aHost:5051", "-v", "stream/12", "-L",
- testfile.getAbsolutePath(), "-R", projectDir.getPath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getExecutable(), is( "accurev.exe" ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "pop",
+ "-H",
+ "aHost:5051",
+ "-v",
+ "stream/12",
+ "-L",
+ testfile.getAbsolutePath(),
+ "-R",
+ projectDir.getPath() } ) );
}
@Test
- public void testPopWorkSpace() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.setExecutable("accurev.exe");
+ public void testPopWorkSpace()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.setExecutable( "accurev.exe" );
- File testFile = new File("project/dir");
- accuRevCL.pop(new File("/home/workspace"), Collections.singleton(testFile), new ArrayList<File>());
+ File testFile = new File( "project/dir" );
+ accuRevCL.pop( new File( "/home/workspace" ), Collections.singleton( testFile ), new ArrayList<File>() );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getExecutable(), is("accurev.exe"));
- assertThat(lastCL.getWorkingDirectory(), is(new File("/home/workspace").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "pop", "-R", testFile.getPath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getExecutable(), is( "accurev.exe" ) );
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/home/workspace" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "pop", "-R", testFile.getPath() } ) );
}
@Test
- public void testMkws() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.setExecutable("accurev2.exe");
- File workspaceFile = new File("/my/workspace/location");
- accuRevCL.mkws("myStream", "myWorkSpaceName", workspaceFile);
+ public void testMkws()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.setExecutable( "accurev2.exe" );
+ File workspaceFile = new File( "/my/workspace/location" );
+ accuRevCL.mkws( "myStream", "myWorkSpaceName", workspaceFile );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getExecutable(), is("accurev2.exe"));
- assertThat(lastCL.getWorkingDirectory(), is(workspaceFile.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "mkws", "-b", "myStream", "-w", "myWorkSpaceName", "-l",
- workspaceFile.getAbsolutePath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getExecutable(), is( "accurev2.exe" ) );
+ assertThat( lastCL.getWorkingDirectory(), is( workspaceFile.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "mkws",
+ "-b",
+ "myStream",
+ "-w",
+ "myWorkSpaceName",
+ "-l",
+ workspaceFile.getAbsolutePath() } ) );
}
@Test
- public void testUpdate() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- File workspaceFile = new File("/my/ws/loc");
- accuRevCL.update(workspaceFile, "highest", new ArrayList<File>());
+ public void testUpdate()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ File workspaceFile = new File( "/my/ws/loc" );
+ accuRevCL.update( workspaceFile, "highest", new ArrayList<File>() );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(workspaceFile.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "update", "-t", "highest" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( workspaceFile.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "update", "-t", "highest" } ) );
}
@Test
- public void testInfo() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.info(new File("/my/base/dir"));
+ public void testInfo()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.info( new File( "/my/base/dir" ) );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(new File("/my/base/dir").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "info" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/my/base/dir" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "info" } ) );
}
@Test
- public void testRemoveWorkspace() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.rmws("myWorkspaceName");
+ public void testRemoveWorkspace()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.rmws( "myWorkspaceName" );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getArguments(), is(new String[] { "rmws", "-s", "myWorkspaceName" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getArguments(), is( new String[] { "rmws", "-s", "myWorkspaceName" } ) );
}
@Test
- public void testStatIgnored() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- File testFile = new File("/my/base/dir");
- accuRevCL.stat(testFile);
+ public void testStatIgnored()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ File testFile = new File( "/my/base/dir" );
+ accuRevCL.stat( testFile );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-fx", testFile.getAbsolutePath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getArguments(), is( new String[] { "stat", "-fx", testFile.getAbsolutePath() } ) );
}
@Test
- public void testReactivate() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.reactivate("ArANdomWorkspaceName");
+ public void testReactivate()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.reactivate( "ArANdomWorkspaceName" );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getArguments(), is(new String[] { "reactivate", "wspace", "ArANdomWorkspaceName" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getArguments(), is( new String[] { "reactivate", "wspace", "ArANdomWorkspaceName" } ) );
}
@Test
- public void testReset() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- Commandline cl = accuRevCL.getCommandline();
- String[] shellCmds = cl.getShellCommandline();
- accuRevCL.reset();
- assertThat(accuRevCL.getCommandline().getShellCommandline(), is(shellCmds));
- assertThat(accuRevCL.getCommandline().getShell().getExecutable(), is("accurev"));
+ public void testReset()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ Commandline cl = accuRevCL.getCommandline();
+ String[] shellCmds = cl.getShellCommandline();
+ accuRevCL.reset();
+ assertThat( accuRevCL.getCommandline().getShellCommandline(), is( shellCmds ) );
+ assertThat( accuRevCL.getCommandline().getShell().getExecutable(), is( "accurev" ) );
}
@Test
- public void testAdd() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- List<File> files = new ArrayList<File>();
- File testFile = new File("my/test/file");
- files.add(testFile);
- assertThat(accuRevCL.add(new File("/workspace"), files, "my commit message", new ArrayList<File>()), is(true));
+ public void testAdd()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ List<File> files = new ArrayList<File>();
+ File testFile = new File( "my/test/file" );
+ files.add( testFile );
+ assertThat( accuRevCL.add( new File( "/workspace" ), files, "my commit message", new ArrayList<File>() ),
+ is( true ) );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(new File("/workspace").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "add", "-c", "my commit message", testFile.getPath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/workspace" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "add", "-c", "my commit message", testFile.getPath() } ) );
- assertThat(accuRevCL.add(new File("/workspace"), files, "", new ArrayList<File>()), is(true));
- assertThat(lastCL.getArguments(), is(new String[] { "add", "-c", AccuRev.DEFAULT_ADD_MESSAGE, testFile.getPath() }));
+ assertThat( accuRevCL.add( new File( "/workspace" ), files, "", new ArrayList<File>() ), is( true ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "add",
+ "-c",
+ AccuRev.DEFAULT_ADD_MESSAGE,
+ testFile.getPath() } ) );
}
@SuppressWarnings("unchecked")
@Test
- public void testRemove() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- List<File> files = new ArrayList<File>();
- File testFile = new File("my/test/file");
- files.add(testFile);
- File workspaceFile = new File("/workspace");
- assertThat(accuRevCL.defunct(workspaceFile, files, "my commit message", new ArrayList<File>()), is(true));
+ public void testRemove()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ List<File> files = new ArrayList<File>();
+ File testFile = new File( "my/test/file" );
+ files.add( testFile );
+ File workspaceFile = new File( "/workspace" );
+ assertThat( accuRevCL.defunct( workspaceFile, files, "my commit message", new ArrayList<File>() ), is( true ) );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(workspaceFile.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "defunct", "-c", "my commit message", testFile.getPath() }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( workspaceFile.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(),
+ is( new String[] { "defunct", "-c", "my commit message", testFile.getPath() } ) );
- assertThat(accuRevCL.defunct(workspaceFile, files, "", new ArrayList<File>()), is(true));
- assertThat(lastCL.getArguments(), is(new String[] { "defunct", "-c", AccuRev.DEFAULT_REMOVE_MESSAGE, testFile.getPath() }));
+ assertThat( accuRevCL.defunct( workspaceFile, files, "", new ArrayList<File>() ), is( true ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "defunct",
+ "-c",
+ AccuRev.DEFAULT_REMOVE_MESSAGE,
+ testFile.getPath() } ) );
- assertThat(accuRevCL.defunct(workspaceFile, Collections.EMPTY_LIST, "", new ArrayList<File>()), is(true));
- assertThat(lastCL.getArguments(), is(new String[] { "defunct", "-c", AccuRev.DEFAULT_REMOVE_MESSAGE, "." }));
+ assertThat( accuRevCL.defunct( workspaceFile, Collections.EMPTY_LIST, "", new ArrayList<File>() ), is( true ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "defunct", "-c", AccuRev.DEFAULT_REMOVE_MESSAGE, "." } ) );
- assertThat(accuRevCL.defunct(workspaceFile, null, "", new ArrayList<File>()), is(true));
- assertThat(lastCL.getArguments(), is(new String[] { "defunct", "-c", AccuRev.DEFAULT_REMOVE_MESSAGE, "." }));
+ assertThat( accuRevCL.defunct( workspaceFile, null, "", new ArrayList<File>() ), is( true ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "defunct", "-c", AccuRev.DEFAULT_REMOVE_MESSAGE, "." } ) );
}
@Test
- public void testChangeWorkspace() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.chws(new File("/my/workspace"), "the_workspace_name_me", "a-snapshot");
+ public void testChangeWorkspace()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.chws( new File( "/my/workspace" ), "the_workspace_name_me", "a-snapshot" );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(new File("/my/workspace").getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "chws", "-s", "the_workspace_name_me", "-b", "a-snapshot", "-l", "." }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( new File( "/my/workspace" ).getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "chws",
+ "-s",
+ "the_workspace_name_me",
+ "-b",
+ "a-snapshot",
+ "-l",
+ "." } ) );
}
@Test
- public void testMkSnap() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.mksnap("a-snapshot", "basisStream");
+ public void testMkSnap()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.mksnap( "a-snapshot", "basisStream" );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getArguments(), is(new String[] { "mksnap", "-s", "a-snapshot", "-b", "basisStream", "-t", "now" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "mksnap",
+ "-s",
+ "a-snapshot",
+ "-b",
+ "basisStream",
+ "-t",
+ "now" } ) );
}
@Test
- public void testStatTag() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.statTag("a-snapshot", new ArrayList<File>());
+ public void testStatTag()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.statTag( "a-snapshot", new ArrayList<File>() );
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-a", "-ffl", "-s", "a-snapshot" }));
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getArguments(), is( new String[] { "stat", "-a", "-ffl", "-s", "a-snapshot" } ) );
}
@Test
- public void testStatBackingStream() throws Exception {
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ public void testStatBackingStream()
+ throws Exception
+ {
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- File basedir = new File("/my/workspace");
- List<File> elements = new ArrayList<File>(1);
- File addedOrModifiedFile = new File("addedOrModified/file");
- elements.add(addedOrModifiedFile);
- List<File> memberElements = new ArrayList<File>();
- List<File> nonMemberElements = new ArrayList<File>();
+ File basedir = new File( "/my/workspace" );
+ List<File> elements = new ArrayList<File>( 1 );
+ File addedOrModifiedFile = new File( "addedOrModified/file" );
+ elements.add( addedOrModifiedFile );
+ List<File> memberElements = new ArrayList<File>();
+ List<File> nonMemberElements = new ArrayList<File>();
- accuRevCL.statBackingStream(basedir, elements, memberElements, nonMemberElements);
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(basedir.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-b", "-ffr", addedOrModifiedFile.getPath() }));
+ accuRevCL.statBackingStream( basedir, elements, memberElements, nonMemberElements );
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( basedir.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "stat", "-b", "-ffr", addedOrModifiedFile.getPath() } ) );
}
@Test
- public void testStatRecursive() throws Exception {
+ public void testStatRecursive()
+ throws Exception
+ {
- File basedir = new File("/my/workspace");
- List<File> noFiles = new ArrayList<File>();
+ File basedir = new File( "/my/workspace" );
+ List<File> noFiles = new ArrayList<File>();
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.stat(basedir, noFiles, AccuRevStat.KEPT, new ArrayList<File>());
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(basedir.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-ffr", "-k", "-R", "." }));
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.stat( basedir, noFiles, AccuRevStat.KEPT, new ArrayList<File>() );
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( basedir.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "stat", "-ffr", "-k", "-R", "." } ) );
- noFiles.add(new File("."));
- accuRevCL.stat(basedir, noFiles, AccuRevStat.DEFUNCT, new ArrayList<File>());
- lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(basedir.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-ffr", "-D", "-R", "." }));
+ noFiles.add( new File( "." ) );
+ accuRevCL.stat( basedir, noFiles, AccuRevStat.DEFUNCT, new ArrayList<File>() );
+ lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( basedir.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] { "stat", "-ffr", "-D", "-R", "." } ) );
}
@Test
- public void testStatSpecificFilesAndDirectories() throws Exception {
+ public void testStatSpecificFilesAndDirectories()
+ throws Exception
+ {
- File basedir = new File("/my/workspace");
- List<File> files = new ArrayList<File>();
- File testDir = new File("a/dir");
- files.add(testDir);
- File testFile = new File("a/dir/a.file");
- files.add(testFile);
+ File basedir = new File( "/my/workspace" );
+ List<File> files = new ArrayList<File>();
+ File testDir = new File( "a/dir" );
+ files.add( testDir );
+ File testFile = new File( "a/dir/a.file" );
+ files.add( testFile );
- AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
- accuRevCL.stat(basedir, files, AccuRevStat.MISSING, new ArrayList<File>());
- Commandline lastCL = accuRevCL.getCommandline();
- assertThat(lastCL.getWorkingDirectory(), is(basedir.getCanonicalFile()));
- assertThat(lastCL.getArguments(), is(new String[] { "stat", "-ffr", "-M", testDir.getPath(), testFile.getPath() }));
+ AccuRevCommandLineTester accuRevCL = new AccuRevCommandLineTester();
+ accuRevCL.stat( basedir, files, AccuRevStat.MISSING, new ArrayList<File>() );
+ Commandline lastCL = accuRevCL.getCommandline();
+ assertThat( lastCL.getWorkingDirectory(), is( basedir.getCanonicalFile() ) );
+ assertThat( lastCL.getArguments(), is( new String[] {
+ "stat",
+ "-ffr",
+ "-M",
+ testDir.getPath(),
+ testFile.getPath() } ) );
}
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java Sat Jan 9 20:49:50 2010
@@ -39,8 +39,8 @@
public static void consume( String resource, StreamConsumer consumer )
throws IOException
{
- BufferedReader reader =
- new BufferedReader( new InputStreamReader( consumer.getClass().getResourceAsStream( resource ) ) );
+ BufferedReader reader = new BufferedReader( new InputStreamReader( consumer.getClass()
+ .getResourceAsStream( resource ) ) );
String line = reader.readLine();
while ( line != null )
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevStatTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevStatTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevStatTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevStatTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,9 @@
* under the License.
*/
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.Assert.assertThat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,8 @@
* under the License.
*/
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import org.junit.Test;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -13,8 +13,9 @@
* governing permissions and limitations under the License.
*/
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.ArrayList;
@@ -23,64 +24,69 @@
import org.codehaus.plexus.util.cli.StreamConsumer;
import org.junit.Test;
-public class FileConsumerTest {
+public class FileConsumerTest
+{
@Test
- public void testConsumeAdd() {
- List<File> extractedFiles = new ArrayList<File>();
-
- StreamConsumer consumer = new FileConsumer(extractedFiles, FileConsumer.ADD_PATTERN);
-
- consumer.consumeLine("Added and kept element /./src/main/java/Application.java");
- consumer.consumeLine("Added and kept element \\.\\src\\main\\java\\Windows.java");
-
- assertThat(extractedFiles.size(), is(2));
- assertThat(extractedFiles, hasItem(new File("src/main/java/Application.java")));
- assertThat(extractedFiles, hasItem(new File("src\\main\\java\\Windows.java")));
+ public void testConsumeAdd()
+ {
+ List<File> extractedFiles = new ArrayList<File>();
+
+ StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.ADD_PATTERN );
+
+ consumer.consumeLine( "Added and kept element /./src/main/java/Application.java" );
+ consumer.consumeLine( "Added and kept element \\.\\src\\main\\java\\Windows.java" );
+
+ assertThat( extractedFiles.size(), is( 2 ) );
+ assertThat( extractedFiles, hasItem( new File( "src/main/java/Application.java" ) ) );
+ assertThat( extractedFiles, hasItem( new File( "src\\main\\java\\Windows.java" ) ) );
}
@Test
- public void testConsumeUpdate() {
- List<File> extractedFiles = new ArrayList<File>();
- StreamConsumer consumer = new FileConsumer(extractedFiles, FileConsumer.UPDATE_PATTERN);
-
- consumer.consumeLine("Content (1 K) of \"readme.txt\" - ok");
- consumer.consumeLine("Creating dir \"src/main/java/org\" .");
- consumer.consumeLine("Updating (creating) dir /./src/test/java");
- consumer.consumeLine("Updating element \\.\\src\\main\\java\\Application.java");
-
- assertThat(extractedFiles.size(), is(2));
- assertThat(extractedFiles, hasItem(new File("readme.txt")));
- assertThat(extractedFiles, hasItem(new File("src\\main\\java\\Application.java")));
+ public void testConsumeUpdate()
+ {
+ List<File> extractedFiles = new ArrayList<File>();
+ StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.UPDATE_PATTERN );
+
+ consumer.consumeLine( "Content (1 K) of \"readme.txt\" - ok" );
+ consumer.consumeLine( "Creating dir \"src/main/java/org\" ." );
+ consumer.consumeLine( "Updating (creating) dir /./src/test/java" );
+ consumer.consumeLine( "Updating element \\.\\src\\main\\java\\Application.java" );
+
+ assertThat( extractedFiles.size(), is( 2 ) );
+ assertThat( extractedFiles, hasItem( new File( "readme.txt" ) ) );
+ assertThat( extractedFiles, hasItem( new File( "src\\main\\java\\Application.java" ) ) );
}
@Test
- public void testConsumePromoted() {
- List<File> extractedFiles = new ArrayList<File>();
-
- StreamConsumer consumer = new FileConsumer(extractedFiles, FileConsumer.PROMOTE_PATTERN);
-
- consumer.consumeLine("Promoted element /./src/main/java/Application.java");
- consumer.consumeLine("Promoted element \\.\\src\\main\\java\\Windows.java");
-
- assertThat(extractedFiles.size(), is(2));
- assertThat(extractedFiles, hasItem(new File("src/main/java/Application.java")));
- assertThat(extractedFiles, hasItem(new File("src\\main\\java\\Windows.java")));
+ public void testConsumePromoted()
+ {
+ List<File> extractedFiles = new ArrayList<File>();
+
+ StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.PROMOTE_PATTERN );
+
+ consumer.consumeLine( "Promoted element /./src/main/java/Application.java" );
+ consumer.consumeLine( "Promoted element \\.\\src\\main\\java\\Windows.java" );
+
+ assertThat( extractedFiles.size(), is( 2 ) );
+ assertThat( extractedFiles, hasItem( new File( "src/main/java/Application.java" ) ) );
+ assertThat( extractedFiles, hasItem( new File( "src\\main\\java\\Windows.java" ) ) );
}
@Test
- public void testConsumeRemoved() {
- List<File> extractedFiles = new ArrayList<File>();
- StreamConsumer consumer = new FileConsumer(extractedFiles, FileConsumer.DEFUNCT_PATTERN);
-
- consumer.consumeLine("Recursively removing \"tcktests/src\" .");
- consumer.consumeLine("Removing \"tcktests/src/main/java/Application.java\" .");
- consumer.consumeLine("Removing \"tcktests/src/main/java\" .");
- consumer.consumeLine("Removing \"tcktests/src/main\" .");
- consumer.consumeLine("Removing \"tcktests/src\" .");
-
- assertThat(extractedFiles.size(), is(4));
- assertThat(extractedFiles, hasItem(new File("tcktests/src")));
- assertThat(extractedFiles, hasItem(new File("tcktests/src/main/java/Application.java")));
+ public void testConsumeRemoved()
+ {
+ List<File> extractedFiles = new ArrayList<File>();
+ StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.DEFUNCT_PATTERN );
+
+ consumer.consumeLine( "Recursively removing \"tcktests/src\" ." );
+ consumer.consumeLine( "Removing \"tcktests/src/main/java/Application.java\" ." );
+ consumer.consumeLine( "Removing \"tcktests/src/main/java\" ." );
+ consumer.consumeLine( "Removing \"tcktests/src/main\" ." );
+ consumer.consumeLine( "Removing \"tcktests/src\" ." );
+
+ assertThat( extractedFiles.size(), is( 4 ) );
+ assertThat( extractedFiles, hasItem( new File( "tcktests/src" ) ) );
+ assertThat( extractedFiles, hasItem( new File( "tcktests/src/main/java/Application.java" ) ) );
}
}
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,9 @@
* under the License.
*/
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.ArrayList;
@@ -67,7 +68,8 @@
public void describeTo( Description desc )
{
- desc.appendText( "version with id=" + elementId + " virtual=" + virtual + " real=" + real + " path=" + path );
+ desc
+ .appendText( "version with id=" + elementId + " virtual=" + virtual + " real=" + real + " path=" + path );
}
}
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,9 @@
* under the License.
*/
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
import java.io.BufferedReader;
import java.io.File;
@@ -28,7 +29,6 @@
import java.io.InputStreamReader;
import org.apache.maven.scm.provider.accurev.AccuRevInfo;
-import org.apache.maven.scm.provider.accurev.cli.InfoConsumer;
import org.codehaus.plexus.util.cli.StreamConsumer;
import org.junit.Test;
@@ -68,8 +68,8 @@
AccuRevInfo info = new AccuRevInfo( new File( "/my/project/dir" ) );
StreamConsumer consumer = new InfoConsumer( info );
- BufferedReader reader =
- new BufferedReader( new InputStreamReader( this.getClass().getResourceAsStream( resource ) ) );
+ BufferedReader reader = new BufferedReader( new InputStreamReader( this.getClass()
+ .getResourceAsStream( resource ) ) );
String line = reader.readLine();
while ( line != null )
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,9 @@
* under the License.
*/
-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.ArrayList;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/StatConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,7 +19,8 @@
* under the License.
*/
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.io.IOException;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java Sat Jan 9 20:49:50 2010
@@ -19,8 +19,9 @@
* under the License.
*/
-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.io.InputStream;
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java Sat Jan 9 20:49:50 2010
@@ -13,8 +13,12 @@
* governing permissions and limitations under the License.
*/
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.ArrayList;
@@ -31,7 +35,8 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.StringUtils;
-public class AccuRevTckUtil {
+public class AccuRevTckUtil
+{
private String depotName = null;
@@ -45,182 +50,227 @@
private String tckBaseDir;
- public static String getSystemProperty(String name, String defaultValue) {
- String mavenProperty = "${" + name + "}";
- String result = System.getProperty(name, mavenProperty);
- if (mavenProperty.equals(result)) {
- result = defaultValue;
- }
- return result;
- }
-
- public String getScmUrl() throws Exception {
- if (url == null) {
-
- // Either tckUrlPrefix or tckAllowImpliedConnection must be set.
- // This is to prevent accidentally running the tck tests against say your production accurev server
-
- String tckUrlPrefix = getSystemProperty("tckUrlPrefix", "");
-
- if (StringUtils.isBlank(tckUrlPrefix)) {
- assertThat("Property \"tckUrlPrefix\" is not set."
- + " To enable tck tests against an externally logged in accurev session,"
- + " please set property \"tckAllowImpliedLogin\" to \"true\"", getSystemProperty("tckAllowImpliedLogin",
- "false"), is("true"));
- } else {
- assertThat("tckUrlPrefix must of the form [[user[/pass]]@host[:port]", tckUrlPrefix, containsString("@"));
- }
-
- url = "scm:accurev:" + tckUrlPrefix + ":" + getDepotName();
-
- getLogger().debug("Using scmURL=" + url);
- }
-
- return url;
+ public static String getSystemProperty( String name, String defaultValue )
+ {
+ String mavenProperty = "${" + name + "}";
+ String result = System.getProperty( name, mavenProperty );
+ if ( mavenProperty.equals( result ) )
+ {
+ result = defaultValue;
+ }
+ return result;
+ }
+
+ public String getScmUrl()
+ throws Exception
+ {
+ if ( url == null )
+ {
+
+ // Either tckUrlPrefix or tckAllowImpliedConnection must be set.
+ // This is to prevent accidentally running the tck tests against say your production accurev server
+
+ String tckUrlPrefix = getSystemProperty( "tckUrlPrefix", "" );
+
+ if ( StringUtils.isBlank( tckUrlPrefix ) )
+ {
+ assertThat( "Property \"tckUrlPrefix\" is not set."
+ + " To enable tck tests against an externally logged in accurev session,"
+ + " please set property \"tckAllowImpliedLogin\" to \"true\"",
+ getSystemProperty( "tckAllowImpliedLogin", "false" ), is( "true" ) );
+ }
+ else
+ {
+ assertThat( "tckUrlPrefix must of the form [[user[/pass]]@host[:port]", tckUrlPrefix,
+ containsString( "@" ) );
+ }
+
+ url = "scm:accurev:" + tckUrlPrefix + ":" + getDepotName();
+
+ getLogger().debug( "Using scmURL=" + url );
+ }
+
+ return url;
}
- private void setLogger(PlexusContainer plexusContainer) throws Exception {
- this.logger = AccuRevJUnitUtil.getLogger(plexusContainer);
- }
-
- public void initRepo(PlexusContainer container) throws Exception {
- setLogger(container);
- initRepo();
+ private void setLogger( PlexusContainer plexusContainer )
+ throws Exception
+ {
+ this.logger = AccuRevJUnitUtil.getLogger( plexusContainer );
+ }
+
+ public void initRepo( PlexusContainer container )
+ throws Exception
+ {
+ setLogger( container );
+ initRepo();
}
@SuppressWarnings("unchecked")
- private void initRepo() throws Exception {
-
- assertLoggedInOK();
-
- assertThat("Can't execute TckTests in an accurev workspace, please set 'tckBaseDir' property", getAccuRevInfo()
- .isWorkSpace(), is(false));
-
- File initDir = ScmTestCase.getTestFile(getTckBaseDir(), "target/" + getDepotName() + "/init");
-
- assertThat("AccuRev workspace path limit of 127 characters execeeded, please set 'basedir' property", initDir
- .getAbsolutePath().length(), lessThan(127));
-
- getAccuRevCL().mkdepot(getDepotName());
-
- /*
- * Since scmFileNames is not populated before this is called... we get to duplicate some code here.TODO raise patch to fix
- * this.
- */
-
- List<String> scmFileNames = new ArrayList(4);
- scmFileNames.add("/pom.xml");
- scmFileNames.add("/readme.txt");
- scmFileNames.add("/src/main/java/Application.java");
- scmFileNames.add("/src/test/java/Test.java");
-
- for (String filename : scmFileNames) {
- ScmTestCase.makeFile(initDir, filename, filename);
- }
-
- String initWorkSpace = getDepotName() + "_initRepo";
- getAccuRevCL().mkws(getDepotName(), initWorkSpace, initDir);
-
- getAccuRevCL().add(initDir, null, "initial version", new ArrayList<File>());
- getAccuRevCL().promoteAll(initDir, "initial version", new ArrayList<File>());
-
- getAccuRevCL().rmws(initWorkSpace + "_" + getAccuRevInfo().getUser());
- }
-
- private String getTckBaseDir() {
- if (tckBaseDir == null) {
- tckBaseDir = getSystemProperty("tckBaseDir", "");
- if (StringUtils.isBlank(tckBaseDir)) {
- tckBaseDir = ScmTestCase.getBasedir();
- }
- getLogger().debug("tckBaseDir=" + tckBaseDir);
-
- }
-
- return tckBaseDir;
- }
-
- private void assertLoggedInOK() throws Exception {
-
- assertThat(getAccuRevInfo().getUser(), notNullValue());
- assertThat(getAccuRevInfo().getUser(), is(not("(not logged in)")));
- }
-
- public void tearDown() throws Exception {
- // nothing left...
- }
-
- public String getDepotName() {
- if (depotName == null) {
- depotName = "mvnscm_" + (System.currentTimeMillis() / 1000);
- }
- return depotName;
- }
-
- public ScmLogger getLogger() {
- if (logger == null) {
- logger = new DefaultLog();
- }
-
- return logger;
- }
-
- public AccuRevCommandLine getAccuRevCL() throws Exception {
- if (accurevCL == null) {
- AccuRevScmProvider provider = new AccuRevScmProvider();
- provider.addListener(getLogger());
- AccuRevScmProviderRepository repo = (AccuRevScmProviderRepository) provider.makeProviderScmRepository(getScmUrl(), ':');
- getLogger().debug(repo.toString());
- accurevCL = (AccuRevCommandLine) repo.getAccuRev();
-
- if (!StringUtils.isEmpty(repo.getUser())) {
- accurevCL.login(repo.getUser(), repo.getPassword());
- }
-
- }
-
- return accurevCL;
- }
-
- public void removeWorkSpace(File basedir) throws Exception {
- try {
- assertLoggedInOK();
- } catch (AssertionError e) {
- return;
- }
- if (basedir.exists()) {
- AccuRevInfo bdInfo = accurevCL.info(basedir);
- if (bdInfo.isWorkSpaceTop()) {
- accurevCL.promoteAll(basedir, "clear default group", new ArrayList<File>());
- accurevCL.rmws(bdInfo.getWorkSpace());
- }
- }
- }
-
- public AccuRevInfo getAccuRevInfo() throws Exception {
- if (info == null) {
- File basedir = new File(getTckBaseDir());
- info = getAccuRevCL().info(basedir);
- }
+ private void initRepo()
+ throws Exception
+ {
+
+ assertLoggedInOK();
+
+ assertThat( "Can't execute TckTests in an accurev workspace, please set 'tckBaseDir' property",
+ getAccuRevInfo().isWorkSpace(), is( false ) );
+
+ File initDir = ScmTestCase.getTestFile( getTckBaseDir(), "target/" + getDepotName() + "/init" );
+
+ assertThat( "AccuRev workspace path limit of 127 characters execeeded, please set 'basedir' property", initDir
+ .getAbsolutePath().length(), lessThan( 127 ) );
+
+ getAccuRevCL().mkdepot( getDepotName() );
+
+ /*
+ * Since scmFileNames is not populated before this is called... we get to duplicate some
+ * code here.TODO raise patch to fix this.
+ */
+
+ List<String> scmFileNames = new ArrayList( 4 );
+ scmFileNames.add( "/pom.xml" );
+ scmFileNames.add( "/readme.txt" );
+ scmFileNames.add( "/src/main/java/Application.java" );
+ scmFileNames.add( "/src/test/java/Test.java" );
+
+ for ( String filename : scmFileNames )
+ {
+ ScmTestCase.makeFile( initDir, filename, filename );
+ }
+
+ String initWorkSpace = getDepotName() + "_initRepo";
+ getAccuRevCL().mkws( getDepotName(), initWorkSpace, initDir );
+
+ getAccuRevCL().add( initDir, null, "initial version", new ArrayList<File>() );
+ getAccuRevCL().promoteAll( initDir, "initial version", new ArrayList<File>() );
+
+ getAccuRevCL().rmws( initWorkSpace + "_" + getAccuRevInfo().getUser() );
+ }
+
+ private String getTckBaseDir()
+ {
+ if ( tckBaseDir == null )
+ {
+ tckBaseDir = getSystemProperty( "tckBaseDir", "" );
+ if ( StringUtils.isBlank( tckBaseDir ) )
+ {
+ tckBaseDir = ScmTestCase.getBasedir();
+ }
+ getLogger().debug( "tckBaseDir=" + tckBaseDir );
+
+ }
+
+ return tckBaseDir;
+ }
+
+ private void assertLoggedInOK()
+ throws Exception
+ {
+
+ assertThat( getAccuRevInfo().getUser(), notNullValue() );
+ assertThat( getAccuRevInfo().getUser(), is( not( "(not logged in)" ) ) );
+ }
+
+ public void tearDown()
+ throws Exception
+ {
+ // nothing left...
+ }
+
+ public String getDepotName()
+ {
+ if ( depotName == null )
+ {
+ depotName = "mvnscm_" + ( System.currentTimeMillis() / 1000 );
+ }
+ return depotName;
+ }
+
+ public ScmLogger getLogger()
+ {
+ if ( logger == null )
+ {
+ logger = new DefaultLog();
+ }
+
+ return logger;
+ }
+
+ public AccuRevCommandLine getAccuRevCL()
+ throws Exception
+ {
+ if ( accurevCL == null )
+ {
+ AccuRevScmProvider provider = new AccuRevScmProvider();
+ provider.addListener( getLogger() );
+ AccuRevScmProviderRepository repo = (AccuRevScmProviderRepository) provider
+ .makeProviderScmRepository( getScmUrl(), ':' );
+ getLogger().debug( repo.toString() );
+ accurevCL = (AccuRevCommandLine) repo.getAccuRev();
+
+ if ( !StringUtils.isEmpty( repo.getUser() ) )
+ {
+ accurevCL.login( repo.getUser(), repo.getPassword() );
+ }
+
+ }
+
+ return accurevCL;
+ }
+
+ public void removeWorkSpace( File basedir )
+ throws Exception
+ {
+ try
+ {
+ assertLoggedInOK();
+ }
+ catch ( AssertionError e )
+ {
+ return;
+ }
+ if ( basedir.exists() )
+ {
+ AccuRevInfo bdInfo = accurevCL.info( basedir );
+ if ( bdInfo.isWorkSpaceTop() )
+ {
+ accurevCL.promoteAll( basedir, "clear default group", new ArrayList<File>() );
+ accurevCL.rmws( bdInfo.getWorkSpace() );
+ }
+ }
+ }
+
+ public AccuRevInfo getAccuRevInfo()
+ throws Exception
+ {
+ if ( info == null )
+ {
+ File basedir = new File( getTckBaseDir() );
+ info = getAccuRevCL().info( basedir );
+ }
- return info;
+ return info;
}
/*
- * Need to put this in a sub directory because you can't re-use workspace directories And for some stupid reason we only have
- * 127 characters available for the path name
+ * Need to put this in a sub directory because you can't re-use workspace directories And for
+ * some stupid reason we only have 127 characters available for the path name
*/
- public File getWorkingCopy() {
- return ScmTestCase.getTestFile(getTckBaseDir(), "target/" + getDepotName() + "/co");
+ public File getWorkingCopy()
+ {
+ return ScmTestCase.getTestFile( getTckBaseDir(), "target/" + getDepotName() + "/co" );
}
- public File getAssertionCopy() {
- return ScmTestCase.getTestFile(getTckBaseDir(), "target/" + getDepotName() + "/as");
+ public File getAssertionCopy()
+ {
+ return ScmTestCase.getTestFile( getTckBaseDir(), "target/" + getDepotName() + "/as" );
}
- public File getUpdatingCopy() {
- return ScmTestCase.getTestFile(getTckBaseDir(), "target/" + getDepotName() + "/up");
+ public File getUpdatingCopy()
+ {
+ return ScmTestCase.getTestFile( getTckBaseDir(), "target/" + getDepotName() + "/up" );
}
}
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,10 +19,11 @@
* under the License.
*/
-import static org.apache.maven.scm.ScmFileMatcher.*;
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.List;
@@ -41,7 +42,7 @@
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testAdd()
throws Exception
@@ -77,7 +78,7 @@
assertHasScmFile( result.getAddedFiles(), "added/file", ScmFileStatus.ADDED );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testAddFailed()
throws Exception
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,9 +19,10 @@
* under the License.
*/
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.Date;
@@ -72,7 +73,7 @@
}
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testSimpleCase()
throws Exception
@@ -135,7 +136,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testChangeLogFailed()
throws Exception
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,10 +19,11 @@
* under the License.
*/
-import static org.apache.maven.scm.ScmFileMatcher.*;
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.ArrayList;
@@ -45,7 +46,7 @@
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testCheckInRecursive()
throws Exception
@@ -91,7 +92,7 @@
assertHasScmFile( result.getCheckedInFiles(), "promoted/file", ScmFileStatus.CHECKED_IN );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testCheckInFailure()
throws Exception
@@ -174,7 +175,7 @@
context.assertIsSatisfied();
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public void testCheckinExplicitFiles()
throws Exception
{
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,10 +19,11 @@
* under the License.
*/
-import static org.apache.maven.scm.ScmFileMatcher.*;
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.List;
@@ -71,7 +72,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testCheckout()
throws Exception
@@ -111,7 +112,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testCheckoutFailure()
throws Exception
@@ -148,7 +149,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testReCheckoutExistingWorkspaceSameBasis()
throws Exception
@@ -188,7 +189,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testReCheckoutExistingWorkspaceDifferentBasis()
throws Exception
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,10 +19,12 @@
* under the License.
*/
-import static org.apache.maven.scm.ScmFileMatcher.*;
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
+import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.Collection;
@@ -48,7 +50,7 @@
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testExportVersionOutSideWorkspace()
throws Exception
@@ -91,7 +93,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testExportFailure()
throws Exception
@@ -133,7 +135,7 @@
assertThat( result.getProviderMessage(), notNullValue() );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testNonPersistentWithinExistingWorkspace()
throws Exception
@@ -193,7 +195,7 @@
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testNonPersistentCheckoutUsesExport()
// This is same expectations as above, but using checkout method with setPersist = false.
Modified: maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java?rev=897538&r1=897537&r2=897538&view=diff
==============================================================================
--- maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java (original)
+++ maven/sandbox/trunk/scm/maven-scm-provider-accurevnew/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java Sat Jan 9 20:49:50 2010
@@ -19,10 +19,11 @@
* under the License.
*/
-import static org.apache.maven.scm.ScmFileMatcher.*;
-import static org.apache.maven.scm.provider.accurev.AddElementsAction.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.apache.maven.scm.ScmFileMatcher.assertHasScmFile;
+import static org.apache.maven.scm.provider.accurev.AddElementsAction.addElementsTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.List;
@@ -41,7 +42,7 @@
extends AbstractAccuRevCommandTest
{
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testRemove()
throws Exception
@@ -77,7 +78,7 @@
assertHasScmFile( result.getRemovedFiles(), "removed/file", ScmFileStatus.DELETED );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Test
public void testAddFailed()
throws Exception
@@ -89,7 +90,7 @@
{
one( accurev ).defunct( with( basedir ), with( testFileSet.getFileList() ), with( "A deleted file" ),
with( any( List.class ) ) );
- will( returnValue( false ) );
+ will( returnValue( false ) );
inSequence( sequence );
}