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 2012/04/23 10:29:41 UTC
svn commit: r1329120 [3/4] - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz: ./
src/main/java/org/apache/maven/scm/provider/jazz/
src/main/java/org/apache/maven/scm/provider/jazz/command/
src/main/java/org/apache/maven/scm/provider/jaz...
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTest.java Mon Apr 23 08:29:39 2012
@@ -1,9 +1,5 @@
package org.apache.maven.scm.provider.jazz.command.changelog;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmFileStatus;
@@ -12,6 +8,10 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -40,7 +40,7 @@ public class JazzChangeLogCommandTest
private JazzScmProviderRepository repo;
List<ChangeSet> changeSets;
-
+
private JazzHistoryConsumer historyConsumer;
private JazzListChangesetConsumer listChangesetConsumer;
@@ -66,7 +66,8 @@ public class JazzChangeLogCommandTest
throws Exception
{
Commandline cmd = new JazzChangeLogCommand().createHistoryCommand( repo, getScmFileSet() ).getCommandline();
- String expected = "scm history --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --maximum 10000000";
+ String expected =
+ "scm history --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --maximum 10000000";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
@@ -80,34 +81,37 @@ public class JazzChangeLogCommandTest
changeSet = new ChangeSet();
changeSet.setRevision( "1012" );
changeSets.add( changeSet );
-
+
// Now test them
- Commandline cmd = new JazzChangeLogCommand().createListChangesetCommand( repo, getScmFileSet(), changeSets ).getCommandline();
- String expected = "scm list changesets --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --workspace \"Dave's Repository Workspace\" 1010 1012";
+ Commandline cmd =
+ new JazzChangeLogCommand().createListChangesetCommand( repo, getScmFileSet(), changeSets ).getCommandline();
+ String expected =
+ "scm list changesets --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --workspace \"Dave's Repository Workspace\" 1010 1012";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
-
+
public void testHistoryConsumer()
throws Exception
{
- historyConsumer.consumeLine( "Change sets:" );
- historyConsumer.consumeLine( " (1589) ---$ Deb \"[maven-release-plugin] prepare for next development itera...\"" );
- historyConsumer.consumeLine( " (1585) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.21\"" );
- historyConsumer.consumeLine( " (1584) ---$ Deb \"This is my first changeset (2)\"" );
- historyConsumer.consumeLine( " (1583) ---$ Deb \"This is my first changeset (1)\"" );
- historyConsumer.consumeLine( " (1323) ---$ Deb <No comment>" );
- historyConsumer.consumeLine( " (1319) ---$ Deb <No comment>" );
-
- assertEquals( "Wrong number of change sets parsed!", 6, changeSets.size() );
- // The order needs to be preserved.
- assertEquals( "Parsing sequence error (1)", "1589", changeSets.get( 0 ).getRevision() );
- assertEquals( "Parsing sequence error (2)", "1585", changeSets.get( 1 ).getRevision() );
- assertEquals( "Parsing sequence error (3)", "1584", changeSets.get( 2 ).getRevision() );
- assertEquals( "Parsing sequence error (4)", "1583", changeSets.get( 3 ).getRevision() );
- assertEquals( "Parsing sequence error (5)", "1323", changeSets.get( 4 ).getRevision() );
- assertEquals( "Parsing sequence error (6)", "1319", changeSets.get( 5 ).getRevision() );
+ historyConsumer.consumeLine( "Change sets:" );
+ historyConsumer.consumeLine(
+ " (1589) ---$ Deb \"[maven-release-plugin] prepare for next development itera...\"" );
+ historyConsumer.consumeLine( " (1585) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.21\"" );
+ historyConsumer.consumeLine( " (1584) ---$ Deb \"This is my first changeset (2)\"" );
+ historyConsumer.consumeLine( " (1583) ---$ Deb \"This is my first changeset (1)\"" );
+ historyConsumer.consumeLine( " (1323) ---$ Deb <No comment>" );
+ historyConsumer.consumeLine( " (1319) ---$ Deb <No comment>" );
+
+ assertEquals( "Wrong number of change sets parsed!", 6, changeSets.size() );
+ // The order needs to be preserved.
+ assertEquals( "Parsing sequence error (1)", "1589", changeSets.get( 0 ).getRevision() );
+ assertEquals( "Parsing sequence error (2)", "1585", changeSets.get( 1 ).getRevision() );
+ assertEquals( "Parsing sequence error (3)", "1584", changeSets.get( 2 ).getRevision() );
+ assertEquals( "Parsing sequence error (4)", "1583", changeSets.get( 3 ).getRevision() );
+ assertEquals( "Parsing sequence error (5)", "1323", changeSets.get( 4 ).getRevision() );
+ assertEquals( "Parsing sequence error (6)", "1319", changeSets.get( 5 ).getRevision() );
}
-
+
public void testListChangesetConsumer()
throws Exception
{
@@ -130,46 +134,48 @@ public class JazzChangeLogCommandTest
changeSet = new ChangeSet();
changeSet.setRevision( "1319" );
changeSets.add( changeSet );
-
- listChangesetConsumer.consumeLine("Change sets:" );
- listChangesetConsumer.consumeLine(" (1589) ---$ Deb \"[maven-release-plugin] prepare for next development iteration\"" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 25, 2012 10:15 PM (Yesterday)" );
- listChangesetConsumer.consumeLine(" Changes:" );
- listChangesetConsumer.consumeLine(" ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1165) \\GPDB\\pom.xml" );
- listChangesetConsumer.consumeLine(" (1585) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.21\"" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
- listChangesetConsumer.consumeLine(" Changes:" );
- listChangesetConsumer.consumeLine(" ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1165) \\GPDB\\pom.xml" );
- listChangesetConsumer.consumeLine(" (1584) ---$ Deb \"This is my first changeset (2)\"" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
- listChangesetConsumer.consumeLine(" (1583) ---$ Deb \"This is my first changeset (1)\"" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
- listChangesetConsumer.consumeLine(" (1323) ---$ Deb <No comment>" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 24, 2012 11:04 PM (Last Week)" );
- listChangesetConsumer.consumeLine(" Changes:" );
- listChangesetConsumer.consumeLine(" ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1165) \\GPDB\\pom.xml" );
- listChangesetConsumer.consumeLine(" (1319) ---$ Deb <No comment>" );
- listChangesetConsumer.consumeLine(" Component: (1158) \"GPDB\"" );
- listChangesetConsumer.consumeLine(" Modified: Feb 24, 2012 11:03 PM (Last Week)" );
- listChangesetConsumer.consumeLine(" Changes:" );
- listChangesetConsumer.consumeLine(" ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
- listChangesetConsumer.consumeLine(" ---c- (1165) \\GPDB\\pom.xml" );
+
+ listChangesetConsumer.consumeLine( "Change sets:" );
+ listChangesetConsumer.consumeLine(
+ " (1589) ---$ Deb \"[maven-release-plugin] prepare for next development iteration\"" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 25, 2012 10:15 PM (Yesterday)" );
+ listChangesetConsumer.consumeLine( " Changes:" );
+ listChangesetConsumer.consumeLine( " ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1165) \\GPDB\\pom.xml" );
+ listChangesetConsumer.consumeLine(
+ " (1585) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.21\"" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
+ listChangesetConsumer.consumeLine( " Changes:" );
+ listChangesetConsumer.consumeLine( " ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1165) \\GPDB\\pom.xml" );
+ listChangesetConsumer.consumeLine( " (1584) ---$ Deb \"This is my first changeset (2)\"" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
+ listChangesetConsumer.consumeLine( " (1583) ---$ Deb \"This is my first changeset (1)\"" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 25, 2012 10:13 PM (Yesterday)" );
+ listChangesetConsumer.consumeLine( " (1323) ---$ Deb <No comment>" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 24, 2012 11:04 PM (Last Week)" );
+ listChangesetConsumer.consumeLine( " Changes:" );
+ listChangesetConsumer.consumeLine( " ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1165) \\GPDB\\pom.xml" );
+ listChangesetConsumer.consumeLine( " (1319) ---$ Deb <No comment>" );
+ listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ listChangesetConsumer.consumeLine( " Modified: Feb 24, 2012 11:03 PM (Last Week)" );
+ listChangesetConsumer.consumeLine( " Changes:" );
+ listChangesetConsumer.consumeLine( " ---c- (1170) \\GPDB\\GPDBEAR\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
+ listChangesetConsumer.consumeLine( " ---c- (1165) \\GPDB\\pom.xml" );
assertEquals( "Wrong number of change sets parsed!", 6, changeSets.size() );
// The order needs to be preserved.
@@ -188,49 +194,59 @@ public class JazzChangeLogCommandTest
assertEquals( "Parsing error - Author (5)", "Deb", changeSets.get( 4 ).getAuthor() );
assertEquals( "Parsing error - Author (6)", "Deb", changeSets.get( 5 ).getAuthor() );
// Check Comments
- assertEquals( "Parsing error - Comment (1)", "[maven-release-plugin] prepare for next development iteration", changeSets.get( 0 ).getComment() );
- assertEquals( "Parsing error - Comment (2)", "[maven-release-plugin] prepare release GPDB-1.0.21", changeSets.get( 1 ).getComment() );
- assertEquals( "Parsing error - Comment (3)", "This is my first changeset (2)", changeSets.get( 2 ).getComment() );
- assertEquals( "Parsing error - Comment (4)", "This is my first changeset (1)", changeSets.get( 3 ).getComment() );
- assertEquals( "Parsing error - Comment (5)", "No comment", changeSets.get( 4 ).getComment() );
- assertEquals( "Parsing error - Comment (6)", "No comment", changeSets.get( 5 ).getComment() );
+ assertEquals( "Parsing error - Comment (1)", "[maven-release-plugin] prepare for next development iteration",
+ changeSets.get( 0 ).getComment() );
+ assertEquals( "Parsing error - Comment (2)", "[maven-release-plugin] prepare release GPDB-1.0.21",
+ changeSets.get( 1 ).getComment() );
+ assertEquals( "Parsing error - Comment (3)", "This is my first changeset (2)",
+ changeSets.get( 2 ).getComment() );
+ assertEquals( "Parsing error - Comment (4)", "This is my first changeset (1)",
+ changeSets.get( 3 ).getComment() );
+ assertEquals( "Parsing error - Comment (5)", "No comment", changeSets.get( 4 ).getComment() );
+ assertEquals( "Parsing error - Comment (6)", "No comment", changeSets.get( 5 ).getComment() );
// Check Dates
- assertEquals( "Parsing error - Date (1)", getDate( 2012, 01, 25, 22, 15, 0, null ), changeSets.get( 0 ).getDate() );
- assertEquals( "Parsing error - Date (2)", getDate( 2012, 01, 25, 22, 13, 0, null ), changeSets.get( 1 ).getDate() );
- assertEquals( "Parsing error - Date (3)", getDate( 2012, 01, 25, 22, 13, 0, null ), changeSets.get( 2 ).getDate() );
- assertEquals( "Parsing error - Date (4)", getDate( 2012, 01, 25, 22, 13, 0, null ), changeSets.get( 3 ).getDate() );
- assertEquals( "Parsing error - Date (5)", getDate( 2012, 01, 24, 23, 04, 0, null ), changeSets.get( 4 ).getDate() );
- assertEquals( "Parsing error - Date (6)", getDate( 2012, 01, 24, 23, 03, 0, null ), changeSets.get( 5 ).getDate() );
+ assertEquals( "Parsing error - Date (1)", getDate( 2012, 01, 25, 22, 15, 0, null ),
+ changeSets.get( 0 ).getDate() );
+ assertEquals( "Parsing error - Date (2)", getDate( 2012, 01, 25, 22, 13, 0, null ),
+ changeSets.get( 1 ).getDate() );
+ assertEquals( "Parsing error - Date (3)", getDate( 2012, 01, 25, 22, 13, 0, null ),
+ changeSets.get( 2 ).getDate() );
+ assertEquals( "Parsing error - Date (4)", getDate( 2012, 01, 25, 22, 13, 0, null ),
+ changeSets.get( 3 ).getDate() );
+ assertEquals( "Parsing error - Date (5)", getDate( 2012, 01, 24, 23, 04, 0, null ),
+ changeSets.get( 4 ).getDate() );
+ assertEquals( "Parsing error - Date (6)", getDate( 2012, 01, 24, 23, 03, 0, null ),
+ changeSets.get( 5 ).getDate() );
// Check files
List<ChangeFile> files;
files = changeSets.get( 0 ).getFiles();
assertEquals( "Parsing error - Files (1)", 4, files.size() );
- assertEquals( "Parsing error - Files (1) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
+ assertEquals( "Parsing error - Files (1) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
assertEquals( "Parsing error - Files (1) (2)", "\\GPDB\\GPDBResources\\pom.xml", files.get( 1 ).getName() );
- assertEquals( "Parsing error - Files (1) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
- assertEquals( "Parsing error - Files (1) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
+ assertEquals( "Parsing error - Files (1) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
+ assertEquals( "Parsing error - Files (1) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
files = changeSets.get( 1 ).getFiles();
assertEquals( "Parsing error - Files (2)", 4, files.size() );
- assertEquals( "Parsing error - Files (2) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
+ assertEquals( "Parsing error - Files (2) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
assertEquals( "Parsing error - Files (2) (2)", "\\GPDB\\GPDBResources\\pom.xml", files.get( 1 ).getName() );
- assertEquals( "Parsing error - Files (2) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
- assertEquals( "Parsing error - Files (2) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
+ assertEquals( "Parsing error - Files (2) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
+ assertEquals( "Parsing error - Files (2) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
files = changeSets.get( 2 ).getFiles();
assertEquals( "Parsing error - Files (3)", 0, files.size() ); // Yes Virginia, an empty ChangeSet is valid
files = changeSets.get( 3 ).getFiles();
assertEquals( "Parsing error - Files (4)", 0, files.size() ); // Yes Virginia, an empty ChangeSet is valid
files = changeSets.get( 4 ).getFiles();
assertEquals( "Parsing error - Files (5)", 4, files.size() );
- assertEquals( "Parsing error - Files (5) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
+ assertEquals( "Parsing error - Files (5) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
assertEquals( "Parsing error - Files (5) (2)", "\\GPDB\\GPDBResources\\pom.xml", files.get( 1 ).getName() );
- assertEquals( "Parsing error - Files (5) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
- assertEquals( "Parsing error - Files (5) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
+ assertEquals( "Parsing error - Files (5) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
+ assertEquals( "Parsing error - Files (5) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
files = changeSets.get( 5 ).getFiles();
assertEquals( "Parsing error - Files (6)", 4, files.size() );
- assertEquals( "Parsing error - Files (6) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
+ assertEquals( "Parsing error - Files (6) (1)", "\\GPDB\\GPDBEAR\\pom.xml", files.get( 0 ).getName() );
assertEquals( "Parsing error - Files (6) (2)", "\\GPDB\\GPDBResources\\pom.xml", files.get( 1 ).getName() );
- assertEquals( "Parsing error - Files (6) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
- assertEquals( "Parsing error - Files (6) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
+ assertEquals( "Parsing error - Files (6) (3)", "\\GPDB\\GPDBWeb\\pom.xml", files.get( 2 ).getName() );
+ assertEquals( "Parsing error - Files (6) (4)", "\\GPDB\\pom.xml", files.get( 3 ).getName() );
// Check file actions = ScmFileStatus
files = changeSets.get( 0 ).getFiles();
assertEquals( "Parsing error - File Status (1) (1)", ScmFileStatus.MODIFIED, files.get( 0 ).getAction() );
@@ -253,7 +269,7 @@ public class JazzChangeLogCommandTest
assertEquals( "Parsing error - File Status (6) (3)", ScmFileStatus.MODIFIED, files.get( 2 ).getAction() );
assertEquals( "Parsing error - File Status (6) (4)", ScmFileStatus.MODIFIED, files.get( 3 ).getAction() );
}
-
+
public void testListChangesetConsumerWithTimeOnly()
throws Exception
{
@@ -272,7 +288,8 @@ public class JazzChangeLogCommandTest
changeSets.add( changeSet );
listChangesetConsumer.consumeLine( "Change sets:" );
- listChangesetConsumer.consumeLine( " (1809) ---$ Deb \"[maven-release-plugin] prepare for next development iteration\"" );
+ listChangesetConsumer.consumeLine(
+ " (1809) ---$ Deb \"[maven-release-plugin] prepare for next development iteration\"" );
listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
listChangesetConsumer.consumeLine( " Modified: 6:20 PM (5 minutes ago)" );
listChangesetConsumer.consumeLine( " Changes:" );
@@ -280,7 +297,8 @@ public class JazzChangeLogCommandTest
listChangesetConsumer.consumeLine( " ---c- (1171) \\GPDB\\GPDBResources\\pom.xml" );
listChangesetConsumer.consumeLine( " ---c- (1167) \\GPDB\\GPDBWeb\\pom.xml" );
listChangesetConsumer.consumeLine( " ---c- (1165) \\GPDB\\pom.xml" );
- listChangesetConsumer.consumeLine( " (1801) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.26\"" );
+ listChangesetConsumer.consumeLine(
+ " (1801) ---$ Deb \"[maven-release-plugin] prepare release GPDB-1.0.26\"" );
listChangesetConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
listChangesetConsumer.consumeLine( " Modified: 6:18 PM (10 minutes ago)" );
listChangesetConsumer.consumeLine( " Changes:" );
@@ -311,16 +329,25 @@ public class JazzChangeLogCommandTest
assertEquals( "Parsing error - Author (3)", "Deb", changeSets.get( 2 ).getAuthor() );
assertEquals( "Parsing error - Author (4)", "Deb", changeSets.get( 3 ).getAuthor() );
// Check Comments
- assertEquals( "Parsing error - Comment (1)", "[maven-release-plugin] prepare for next development iteration", changeSets.get( 0 ).getComment() );
- assertEquals( "Parsing error - Comment (2)", "[maven-release-plugin] prepare release GPDB-1.0.26", changeSets.get( 1 ).getComment() );
- assertEquals( "Parsing error - Comment (3)", "No comment", changeSets.get( 2 ).getComment() );
- assertEquals( "Parsing error - Comment (4)", "No comment", changeSets.get( 3 ).getComment() );
+ assertEquals( "Parsing error - Comment (1)", "[maven-release-plugin] prepare for next development iteration",
+ changeSets.get( 0 ).getComment() );
+ assertEquals( "Parsing error - Comment (2)", "[maven-release-plugin] prepare release GPDB-1.0.26",
+ changeSets.get( 1 ).getComment() );
+ assertEquals( "Parsing error - Comment (3)", "No comment", changeSets.get( 2 ).getComment() );
+ assertEquals( "Parsing error - Comment (4)", "No comment", changeSets.get( 3 ).getComment() );
// Check Dates
Calendar today = Calendar.getInstance();
- assertEquals( "Parsing error - Date (1)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ), today.get( Calendar.DAY_OF_MONTH ), 18, 20, 0, null ), changeSets.get( 0 ).getDate() );
- assertEquals( "Parsing error - Date (2)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ), today.get( Calendar.DAY_OF_MONTH ), 18, 18, 0, null ), changeSets.get( 1 ).getDate() );
- assertEquals( "Parsing error - Date (3)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ), today.get( Calendar.DAY_OF_MONTH ), 18, 18, 0, null ), changeSets.get( 2 ).getDate() );
- assertEquals( "Parsing error - Date (4)", getDate( 2012, 02, 01, 14, 34, 0, null ), changeSets.get( 3 ).getDate() );
+ assertEquals( "Parsing error - Date (1)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ),
+ today.get( Calendar.DAY_OF_MONTH ), 18, 20, 0, null ),
+ changeSets.get( 0 ).getDate() );
+ assertEquals( "Parsing error - Date (2)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ),
+ today.get( Calendar.DAY_OF_MONTH ), 18, 18, 0, null ),
+ changeSets.get( 1 ).getDate() );
+ assertEquals( "Parsing error - Date (3)", getDate( today.get( Calendar.YEAR ), today.get( Calendar.MONTH ),
+ today.get( Calendar.DAY_OF_MONTH ), 18, 18, 0, null ),
+ changeSets.get( 2 ).getDate() );
+ assertEquals( "Parsing error - Date (4)", getDate( 2012, 02, 01, 14, 34, 0, null ),
+ changeSets.get( 3 ).getDate() );
// Check files
List<ChangeFile> files;
files = changeSets.get( 0 ).getFiles();
@@ -359,13 +386,20 @@ public class JazzChangeLogCommandTest
public void testStripDelimiters()
throws Exception
{
- assertEquals("stripDelimiters() is broken! (1)", "Plain Text", listChangesetConsumer.stripDelimiters( "Plain Text" ));
- assertEquals("stripDelimiters() is broken! (2)", "Plain Text", listChangesetConsumer.stripDelimiters( "\"Plain Text" ));
- assertEquals("stripDelimiters() is broken! (3)", "Plain Text", listChangesetConsumer.stripDelimiters( "Plain Text\"" ));
- assertEquals("stripDelimiters() is broken! (4)", "Plain Text", listChangesetConsumer.stripDelimiters( "\"Plain Text\"" ));
- assertEquals("stripDelimiters() is broken! (5)", "Plain Text", listChangesetConsumer.stripDelimiters( "<Plain Text" ));
- assertEquals("stripDelimiters() is broken! (6)", "Plain Text", listChangesetConsumer.stripDelimiters( "Plain Text>" ));
- assertEquals("stripDelimiters() is broken! (7)", "Plain Text", listChangesetConsumer.stripDelimiters( "<Plain Text>" ));
+ assertEquals( "stripDelimiters() is broken! (1)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "Plain Text" ) );
+ assertEquals( "stripDelimiters() is broken! (2)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "\"Plain Text" ) );
+ assertEquals( "stripDelimiters() is broken! (3)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "Plain Text\"" ) );
+ assertEquals( "stripDelimiters() is broken! (4)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "\"Plain Text\"" ) );
+ assertEquals( "stripDelimiters() is broken! (5)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "<Plain Text" ) );
+ assertEquals( "stripDelimiters() is broken! (6)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "Plain Text>" ) );
+ assertEquals( "stripDelimiters() is broken! (7)", "Plain Text",
+ listChangesetConsumer.stripDelimiters( "<Plain Text>" ) );
}
-
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.checkin;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzCheckInCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -50,6 +51,7 @@ public class JazzCheckInCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -62,6 +64,7 @@ public class JazzCheckInCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -73,6 +76,7 @@ public class JazzCheckInCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
@@ -83,6 +87,7 @@ public class JazzCheckInCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getAssertionCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java Mon Apr 23 08:29:39 2012
@@ -41,7 +41,7 @@ public class JazzCheckInCommandTest
super.setUp();
repo = getScmProviderRepository();
-
+
checkinConsumer = new JazzCheckInConsumer( repo, new DefaultLog() );
}
@@ -49,11 +49,12 @@ public class JazzCheckInCommandTest
throws Exception
{
JazzScmProviderRepository repo = getScmProviderRepository();
- Commandline cmd = new JazzCheckInCommand().createCreateChangesetCommand( repo, getScmFileSet(), "This is my comment." ).getCommandline();
+ Commandline cmd = new JazzCheckInCommand().createCreateChangesetCommand( repo, getScmFileSet(),
+ "This is my comment." ).getCommandline();
String expected = "scm create changeset --username myUserName --password myPassword \"This is my comment.\"";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
-
+
public void testCreateCheckInCommandCheckingInSpecificFiles()
throws Exception
{
@@ -67,16 +68,18 @@ public class JazzCheckInCommandTest
throws Exception
{
JazzScmProviderRepository repo = getScmProviderRepository();
- Commandline cmd = new JazzCheckInCommand().createCheckInCommand( repo, new ScmFileSet( getWorkingDirectory() ) ).getCommandline();
+ Commandline cmd = new JazzCheckInCommand().createCheckInCommand( repo, new ScmFileSet(
+ getWorkingDirectory() ) ).getCommandline();
String expected = "scm checkin --username myUserName --password myPassword .";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
-
+
public void testCheckInConsumerWithFiles()
throws Exception
{
checkinConsumer.consumeLine( "Committing..." );
- checkinConsumer.consumeLine( "Workspace: (1903) \"MavenSCMTestWorkspace_1332908068770\" <-> (1903) \"MavenSCMTestWorkspace_1332908068770\"" );
+ checkinConsumer.consumeLine(
+ "Workspace: (1903) \"MavenSCMTestWorkspace_1332908068770\" <-> (1903) \"MavenSCMTestWorkspace_1332908068770\"" );
checkinConsumer.consumeLine( " Component: (1768) \"MavenSCMTestComponent\"" );
checkinConsumer.consumeLine( " Outgoing:" );
checkinConsumer.consumeLine( " Change sets:" );
@@ -85,23 +88,27 @@ public class JazzCheckInCommandTest
checkinConsumer.consumeLine( " --a-- \\src\\main\\java\\Me.java" );
checkinConsumer.consumeLine( " --a-- \\src\\main\\java\\Me1.java" );
checkinConsumer.consumeLine( " --a-- \\src\\main\\java\\Me2.java" );
-
+
assertEquals( "Wrong number of files parsed!", 3, checkinConsumer.getFiles().size() );
- assertEquals( "Parsing error for file1!", "src\\main\\java\\Me.java", checkinConsumer.getFiles().get( 0 ).getPath() );
- assertEquals( "Parsing error for file2!", "src\\main\\java\\Me1.java", checkinConsumer.getFiles().get( 1 ).getPath() );
- assertEquals( "Parsing error for file3!", "src\\main\\java\\Me2.java", checkinConsumer.getFiles().get( 2 ).getPath() );
+ assertEquals( "Parsing error for file1!", "src\\main\\java\\Me.java",
+ checkinConsumer.getFiles().get( 0 ).getPath() );
+ assertEquals( "Parsing error for file2!", "src\\main\\java\\Me1.java",
+ checkinConsumer.getFiles().get( 1 ).getPath() );
+ assertEquals( "Parsing error for file3!", "src\\main\\java\\Me2.java",
+ checkinConsumer.getFiles().get( 2 ).getPath() );
}
public void testCheckInConsumerWithOutFiles()
throws Exception
{
checkinConsumer.consumeLine( "Committing..." );
- checkinConsumer.consumeLine( "Workspace: (1004) \"Release Repository Workspace\" <-> (1005) \"Maven Release Plugin Stream\"" );
+ checkinConsumer.consumeLine(
+ "Workspace: (1004) \"Release Repository Workspace\" <-> (1005) \"Maven Release Plugin Stream\"" );
checkinConsumer.consumeLine( " Component: (1006) \"Release Component\"" );
checkinConsumer.consumeLine( " Outgoing:" );
checkinConsumer.consumeLine( " Change sets:" );
checkinConsumer.consumeLine( " (1008) --@ <No comment>" );
-
+
assertEquals( "Wrong number of files parsed!", 0, checkinConsumer.getFiles().size() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.checkout;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzCheckOutCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzCheckOutCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzCheckOutCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzCheckOutCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommandTest.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmRevision;
@@ -29,6 +27,8 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.util.List;
+
/**
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
@@ -53,34 +53,40 @@ public class JazzCheckOutCommandTest
ScmRevision rev = new ScmRevision( "revision" );
// TODO figure out what Jazz SCM does in terms of branch/tag/revision
// TODO figure out how/when to load specific files
- Commandline cmd = new JazzCheckOutCommand().createJazzLoadCommand( repo, getScmFileSet(), rev ).getCommandline();
- String expected = "scm load --force --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --dir "
+ Commandline cmd =
+ new JazzCheckOutCommand().createJazzLoadCommand( repo, getScmFileSet(), rev ).getCommandline();
+ String expected =
+ "scm load --force --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --dir "
+ getScmFileSet().getBasedir().getAbsolutePath() + " \"Dave's Repository Workspace\"";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
public void testConsumer()
{
- checkOutConsumer.consumeLine( "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/EmptyFile.txt (0 B)" );
- checkOutConsumer.consumeLine( "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/test.java (123 KB)" );
- checkOutConsumer.consumeLine( "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/file with spaces.java (12.34 KB)" );
- checkOutConsumer.consumeLine( "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/file with spaces.txt (12.3 B)" );
+ checkOutConsumer.consumeLine(
+ "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/EmptyFile.txt (0 B)" );
+ checkOutConsumer.consumeLine(
+ "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/test.java (123 KB)" );
+ checkOutConsumer.consumeLine(
+ "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/file with spaces.java (12.34 KB)" );
+ checkOutConsumer.consumeLine(
+ "Downloading /maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/file with spaces.txt (12.3 B)" );
checkOutConsumer.consumeLine( "" );
List<ScmFile> checkedOutFiles = checkOutConsumer.getCheckedOutFiles();
assertNotNull( checkedOutFiles );
assertEquals( 4, checkedOutFiles.size() );
+ assertTrue( checkedOutFiles.contains(
+ new ScmFile( "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/EmptyFile.txt",
+ ScmFileStatus.CHECKED_OUT ) ) );
assertTrue( checkedOutFiles.contains( new ScmFile(
- "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/EmptyFile.txt",
- ScmFileStatus.CHECKED_OUT ) ) );
- assertTrue( checkedOutFiles.contains( new ScmFile(
- "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/test.java",
- ScmFileStatus.CHECKED_OUT ) ) );
- assertTrue( checkedOutFiles.contains( new ScmFile(
- "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/file with spaces.java",
- ScmFileStatus.CHECKED_OUT ) ) );
+ "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/test.java",
+ ScmFileStatus.CHECKED_OUT ) ) );
+ assertTrue( checkedOutFiles.contains(
+ new ScmFile( "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/file with spaces.java",
+ ScmFileStatus.CHECKED_OUT ) ) );
assertTrue( checkedOutFiles.contains( new ScmFile(
- "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/file with spaces.txt",
- ScmFileStatus.CHECKED_OUT ) ) );
+ "/maven-checkout-test/src/main/java/org/apache/maven/scm/provider/jazz/folder with spaces/file with spaces.txt",
+ ScmFileStatus.CHECKED_OUT ) ) );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumerTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumerTest.java Mon Apr 23 08:29:39 2012
@@ -1,7 +1,6 @@
package org.apache.maven.scm.provider.jazz.command.consumer;
import junit.framework.TestCase;
-
import org.apache.maven.scm.log.DefaultLog;
/*
@@ -27,14 +26,14 @@ import org.apache.maven.scm.log.DefaultL
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class DebugLoggerConsumerTest
- extends TestCase
+ extends TestCase
{
private DebugLoggerConsumer debugConsumer;
-
+
public void setUp()
throws Exception
{
- debugConsumer = new DebugLoggerConsumer(new DefaultLog());
+ debugConsumer = new DebugLoggerConsumer( new DefaultLog() );
}
public void testErrorConsumer()
@@ -44,6 +43,7 @@ public class DebugLoggerConsumerTest
assertTrue( debugConsumer.isFed() );
debugConsumer.consumeLine( "Another line to consume" );
String ls = System.getProperty( "line.separator" );
- assertEquals("Contents were different!", "Some line to consume" + ls + "Another line to consume" + ls, debugConsumer.getOutput());
+ assertEquals( "Contents were different!", "Some line to consume" + ls + "Another line to consume" + ls,
+ debugConsumer.getOutput() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumerTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumerTest.java Mon Apr 23 08:29:39 2012
@@ -1,7 +1,6 @@
package org.apache.maven.scm.provider.jazz.command.consumer;
import junit.framework.TestCase;
-
import org.apache.maven.scm.log.DefaultLog;
/*
@@ -27,10 +26,10 @@ import org.apache.maven.scm.log.DefaultL
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class ErrorConsumerTest
- extends TestCase
+ extends TestCase
{
private ErrorConsumer errConsumer;
-
+
public void setUp()
throws Exception
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.diff;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.diff.DiffCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzDiffCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzDiffCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzDiffCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzDiffCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommandTest.java Mon Apr 23 08:29:39 2012
@@ -30,7 +30,7 @@ public class JazzDiffCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
protected void setUp()
throws Exception
{
@@ -41,8 +41,10 @@ public class JazzDiffCommandTest
public void testCreateDiffCommand()
throws Exception
{
- Commandline cmd = new JazzDiffCommand().createDiffCommand( repo, getScmFileSet(), "src/main/resources/AFile.txt" ).getCommandline();
- String expected = "scm diff --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file src/main/resources/AFile.txt";
+ Commandline cmd = new JazzDiffCommand().createDiffCommand( repo, getScmFileSet(),
+ "src/main/resources/AFile.txt" ).getCommandline();
+ String expected =
+ "scm diff --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file src/main/resources/AFile.txt";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommandTest.java Mon Apr 23 08:29:39 2012
@@ -19,13 +19,13 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.provider.jazz.JazzScmTestCase;
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
@@ -33,7 +33,7 @@ public class JazzEditCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
protected void setUp()
throws Exception
{
@@ -45,7 +45,8 @@ public class JazzEditCommandTest
throws Exception
{
Commandline cmd = new JazzEditCommand().createEditCommand( repo, getScmFileSet() ).getCommandline();
- String expected = "scm lock acquire --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file1 file2";
+ String expected =
+ "scm lock acquire --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file1 file2";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
@@ -53,8 +54,10 @@ public class JazzEditCommandTest
throws Exception
{
// An empty file set will be all files, which jazz will take as a "."
- Commandline cmd = new JazzEditCommand().createEditCommand( repo, new ScmFileSet( new File(".") ) ).getCommandline();
- String expected = "scm lock acquire --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword .";
+ Commandline cmd =
+ new JazzEditCommand().createEditCommand( repo, new ScmFileSet( new File( "." ) ) ).getCommandline();
+ String expected =
+ "scm lock acquire --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword .";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommandTest.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
@@ -28,6 +26,8 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.util.List;
+
/**
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
@@ -45,7 +45,7 @@ public class JazzListCommandTest
repo = getScmProviderRepository();
listConsumer = new JazzListConsumer( getScmProviderRepository(), new DefaultLog() );
-
+
// Simulate the output of the parsing of the "scm status" command.
// IE, fill in the workspace and component details
// Needed for the remote workspace and component name for the list remotefiles
@@ -57,7 +57,8 @@ public class JazzListCommandTest
throws Exception
{
Commandline cmd = new JazzListCommand().createListCommand( repo, getScmFileSet(), true, null ).getCommandline();
- String expected = "scm list remotefiles --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword \"Dave's Repository Workspace\" \"Dave's Component\"";
+ String expected =
+ "scm list remotefiles --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword \"Dave's Repository Workspace\" \"Dave's Component\"";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
@@ -73,45 +74,26 @@ public class JazzListCommandTest
listConsumer.consumeLine( "/BogusTestJazz/src/main/resources/" );
listConsumer.consumeLine( "/BogusTestJazz/src/main/resources/AFile.txt" );
listConsumer.consumeLine( "/BogusTestJazz/src/main/java/" );
- listConsumer.consumeLine( "/BogusTestJazz/src/main/java/BogusTest.java" );
+ listConsumer.consumeLine( "/BogusTestJazz/src/main/java/BogusTest.java" );
// Test the ScmFile and ScmFileStatus bits.
List<ScmFile> changedFiles = listConsumer.getFiles();
assertNotNull( changedFiles );
assertEquals( 11, changedFiles.size() );
- assertTrue( changedFiles.contains( new ScmFile(
- "/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/.jazzignore",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/pom.xml",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/Readme.txt",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/main/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/main/resources/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/main/resources/AFile.txt",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/main/java/",
- ScmFileStatus.CHECKED_IN ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/BogusTestJazz/src/main/java/BogusTest.java",
- ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/.jazzignore", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/pom.xml", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/Readme.txt", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/src/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/src/main/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue(
+ changedFiles.contains( new ScmFile( "/BogusTestJazz/src/main/resources/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/BogusTestJazz/src/main/resources/AFile.txt", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains( new ScmFile( "/BogusTestJazz/src/main/java/", ScmFileStatus.CHECKED_IN ) ) );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/BogusTestJazz/src/main/java/BogusTest.java", ScmFileStatus.CHECKED_IN ) ) );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.status;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.status.StatusCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzStatusCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzStatusCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzStatusCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzStatusCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
@@ -80,6 +84,7 @@ public class JazzStatusCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getUpdatingCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
@@ -28,6 +26,8 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.util.List;
+
/**
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
@@ -35,7 +35,7 @@ public class JazzStatusCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
private JazzStatusConsumer statusConsumer;
protected void setUp()
@@ -56,15 +56,21 @@ public class JazzStatusCommandTest
public void testConsumer()
{
- statusConsumer.consumeLine( "Workspace: (1000) \"Dave's Repository Workspace\" <-> (1001) \"SCM Plugin Stream\"" );
+ statusConsumer.consumeLine(
+ "Workspace: (1000) \"Dave's Repository Workspace\" <-> (1001) \"SCM Plugin Stream\"" );
statusConsumer.consumeLine( " Component: (1002) \"SCM Plugins\"" );
statusConsumer.consumeLine( " Baseline: (1003) 1 \"Initial Baseline\"" );
statusConsumer.consumeLine( " Unresolved:" );
- statusConsumer.consumeLine( " d- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProvider.java" );
- statusConsumer.consumeLine( " a- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProviderRenamed.java" );
- statusConsumer.consumeLine( " d- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/DeletedFile.java" );
- statusConsumer.consumeLine( " a- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/AddedFile.java" );
- statusConsumer.consumeLine( " -c /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/ModifiedFile.java" );
+ statusConsumer.consumeLine(
+ " d- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProvider.java" );
+ statusConsumer.consumeLine(
+ " a- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProviderRenamed.java" );
+ statusConsumer.consumeLine(
+ " d- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/DeletedFile.java" );
+ statusConsumer.consumeLine(
+ " a- /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/AddedFile.java" );
+ statusConsumer.consumeLine(
+ " -c /status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/ModifiedFile.java" );
statusConsumer.consumeLine( " Outgoing:" );
statusConsumer.consumeLine( " Change sets:" );
statusConsumer.consumeLine( " (1008) --@ <No comment>" );
@@ -77,7 +83,7 @@ public class JazzStatusCommandTest
assertEquals( "Flow Target Alias is incorrect!", 1001, repo.getFlowTargetAlias() );
assertEquals( "Component is incorrect!", "SCM Plugins", repo.getComponent() );
assertEquals( "Baseline is incorrect!", "Initial Baseline", repo.getBaseline() );
-
+
// Test the stream parsing and isPushChanges bits.
assertTrue( "isPushChangesAndHaveFlowTargets is incorrect!", repo.isPushChangesAndHaveFlowTargets() );
@@ -85,28 +91,28 @@ public class JazzStatusCommandTest
List<ScmFile> changedFiles = statusConsumer.getChangedFiles();
assertNotNull( changedFiles );
assertEquals( 5, changedFiles.size() );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProvider.java",
+ ScmFileStatus.DELETED ) ) );
assertTrue( changedFiles.contains( new ScmFile(
- "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProvider.java",
- ScmFileStatus.DELETED ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProviderRenamed.java",
- ScmFileStatus.ADDED ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/DeletedFile.java",
- ScmFileStatus.DELETED ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/AddedFile.java",
- ScmFileStatus.ADDED ) ) );
- assertTrue( changedFiles.contains( new ScmFile(
- "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/ModifiedFile.java",
- ScmFileStatus.MODIFIED ) ) );
+ "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/JazzScmProviderRenamed.java",
+ ScmFileStatus.ADDED ) ) );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/DeletedFile.java",
+ ScmFileStatus.DELETED ) ) );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/AddedFile.java",
+ ScmFileStatus.ADDED ) ) );
+ assertTrue( changedFiles.contains(
+ new ScmFile( "/status-test-project/src/main/java/org/apache/maven/scm/provider/jazz/ModifiedFile.java",
+ ScmFileStatus.MODIFIED ) ) );
}
-
+
public void testConsumerWithStream()
{
- statusConsumer.consumeLine( "Workspace: (1156) \"GPDBWorkspace\" <-> (1157) \"GPDBStream\"");
- statusConsumer.consumeLine( " Component: (1158) \"GPDB\" <-> (1157) \"GPDBStream\"");
- statusConsumer.consumeLine( " Baseline: (1159) 1 \"Initial Baseline\"");
+ statusConsumer.consumeLine( "Workspace: (1156) \"GPDBWorkspace\" <-> (1157) \"GPDBStream\"" );
+ statusConsumer.consumeLine( " Component: (1158) \"GPDB\" <-> (1157) \"GPDBStream\"" );
+ statusConsumer.consumeLine( " Baseline: (1159) 1 \"Initial Baseline\"" );
// Test the additional collected data, Workspace, Component, Baseline.
assertEquals( "Workspace is incorrect!", "GPDBWorkspace", repo.getWorkspace() );
@@ -126,9 +132,9 @@ public class JazzStatusCommandTest
public void testConsumerWithOutStream()
{
- statusConsumer.consumeLine( "Workspace: (1156) \"GPDBWorkspace\" <-> (1156) \"GPDBWorkspace\"");
- statusConsumer.consumeLine( " Component: (1158) \"GPDB\"");
- statusConsumer.consumeLine( " Baseline: (1159) 1 \"Initial Baseline\"");
+ statusConsumer.consumeLine( "Workspace: (1156) \"GPDBWorkspace\" <-> (1156) \"GPDBWorkspace\"" );
+ statusConsumer.consumeLine( " Component: (1158) \"GPDB\"" );
+ statusConsumer.consumeLine( " Baseline: (1159) 1 \"Initial Baseline\"" );
// Test the additional collected data, Workspace, Component, Baseline.
assertEquals( "Workspace is incorrect!", "GPDBWorkspace", repo.getWorkspace() );
@@ -145,14 +151,16 @@ public class JazzStatusCommandTest
repo.setPushChanges( true );
assertFalse( "isPushChangesAndHaveFlowTargets is incorrect!", repo.isPushChangesAndHaveFlowTargets() );
}
-
+
public void testConsumerWithAdditionalInfo()
{
- statusConsumer.consumeLine( "Workspace: (1000) \"MavenStream Workspace\" <-> (1005) \"MavenStream Workspace\"");
- statusConsumer.consumeLine( " Component: (1002) \"FireDragon\" <-> (1005) \"MavenR3Stream Workspace\" (outgoing addition)");
- statusConsumer.consumeLine( " Baseline: (1003) 1 \"Initial Baseline\"");
- statusConsumer.consumeLine( " Unresolved:");
- statusConsumer.consumeLine( " a-- /FireDragon/.project");
+ statusConsumer.consumeLine(
+ "Workspace: (1000) \"MavenStream Workspace\" <-> (1005) \"MavenStream Workspace\"" );
+ statusConsumer.consumeLine(
+ " Component: (1002) \"FireDragon\" <-> (1005) \"MavenR3Stream Workspace\" (outgoing addition)" );
+ statusConsumer.consumeLine( " Baseline: (1003) 1 \"Initial Baseline\"" );
+ statusConsumer.consumeLine( " Unresolved:" );
+ statusConsumer.consumeLine( " a-- /FireDragon/.project" );
// Test the additional collected data, Workspace, Component, Baseline.
assertEquals( "Workspace is incorrect!", "MavenStream Workspace", repo.getWorkspace() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.tag;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.tag.TagCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzTagCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzTagCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzTagCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzTagCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommandTest.java Mon Apr 23 08:29:39 2012
@@ -49,32 +49,40 @@ public class JazzTagCommandTest
throws Exception
{
ScmTagParameters scmTagParameters = new ScmTagParameters( "My Tag Message" );
- Commandline cmd = new JazzTagCommand().createTagCreateSnapshotCommand( repo, getScmFileSet(), "My_Tag_Name", scmTagParameters ).getCommandline();
- String expected = "scm create snapshot --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --name My_Tag_Name --description \"My Tag Message\" \"Dave's Repository Workspace\"";
+ Commandline cmd = new JazzTagCommand().createTagCreateSnapshotCommand( repo, getScmFileSet(), "My_Tag_Name",
+ scmTagParameters ).getCommandline();
+ String expected =
+ "scm create snapshot --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --name My_Tag_Name --description \"My Tag Message\" \"Dave's Repository Workspace\"";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
public void testCreateTagCreateWorkspaceCommand()
throws Exception
{
- Commandline cmd = new JazzTagCommand().createTagCreateWorkspaceCommand( repo, getScmFileSet(), "My_Snapshot_Name" ).getCommandline();
- String expected = "scm create workspace --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword My_Snapshot_Name --snapshot My_Snapshot_Name";
+ Commandline cmd = new JazzTagCommand().createTagCreateWorkspaceCommand( repo, getScmFileSet(),
+ "My_Snapshot_Name" ).getCommandline();
+ String expected =
+ "scm create workspace --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword My_Snapshot_Name --snapshot My_Snapshot_Name";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
public void testCreateTagDeliverCommand()
throws Exception
{
- Commandline cmd = new JazzTagCommand().createTagDeliverCommand( repo, getScmFileSet(), "My_Tag_Name" ).getCommandline();
- String expected = "scm deliver --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --source My_Tag_Name --target \"Dave's Stream\"";
+ Commandline cmd =
+ new JazzTagCommand().createTagDeliverCommand( repo, getScmFileSet(), "My_Tag_Name" ).getCommandline();
+ String expected =
+ "scm deliver --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --source My_Tag_Name --target \"Dave's Stream\"";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
public void testCreateTagSnapshotPromoteCommand()
throws Exception
{
- Commandline cmd = new JazzTagCommand().createTagSnapshotPromoteCommand( repo, getScmFileSet(), "My_Snapshot_Name" ).getCommandline();
- String expected = "scm snapshot promote --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword \"Dave's Stream\" My_Snapshot_Name";
+ Commandline cmd = new JazzTagCommand().createTagSnapshotPromoteCommand( repo, getScmFileSet(),
+ "My_Snapshot_Name" ).getCommandline();
+ String expected =
+ "scm snapshot promote --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword \"Dave's Stream\" My_Snapshot_Name";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommandTest.java Mon Apr 23 08:29:39 2012
@@ -1,12 +1,12 @@
package org.apache.maven.scm.provider.jazz.command.unedit;
-import java.io.File;
-
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.provider.jazz.JazzScmTestCase;
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -33,7 +33,7 @@ public class JazzUnEditCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
protected void setUp()
throws Exception
{
@@ -45,7 +45,8 @@ public class JazzUnEditCommandTest
throws Exception
{
Commandline cmd = new JazzUnEditCommand().createUneditCommand( repo, getScmFileSet() ).getCommandline();
- String expected = "scm lock release --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file1 file2";
+ String expected =
+ "scm lock release --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword file1 file2";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
@@ -53,8 +54,10 @@ public class JazzUnEditCommandTest
throws Exception
{
// An empty file set will be all files, which jazz will take as a "."
- Commandline cmd = new JazzUnEditCommand().createUneditCommand( repo, new ScmFileSet( new File(".") ) ).getCommandline();
- String expected = "scm lock release --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword .";
+ Commandline cmd =
+ new JazzUnEditCommand().createUneditCommand( repo, new ScmFileSet( new File( "." ) ) ).getCommandline();
+ String expected =
+ "scm lock release --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword .";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.update;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzUpdateCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzUpdateCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzUpdateCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzUpdateCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
@@ -80,6 +84,7 @@ public class JazzUpdateCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getUpdatingCopy()
*/
@Override
@@ -87,5 +92,5 @@ public class JazzUpdateCommandTckTest
{
return jazzTckUtil.getUpdatingCopy();
}
-
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommandTest.java Mon Apr 23 08:29:39 2012
@@ -30,7 +30,7 @@ public class JazzUpdateCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
protected void setUp()
throws Exception
{
@@ -42,7 +42,8 @@ public class JazzUpdateCommandTest
throws Exception
{
Commandline cmd = new JazzUpdateCommand().createAcceptCommand( repo, getScmFileSet() ).getCommandline();
- String expected = "scm accept --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --flow-components";
+ String expected =
+ "scm accept --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword --flow-components";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
}