You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/05/11 00:01:02 UTC
[maven-scm] branch SCM-887 updated: Synergy
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-887
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/SCM-887 by this push:
new 63d71f7 Synergy
63d71f7 is described below
commit 63d71f7b17201011ad06033404f42e8ce481d852
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri May 11 02:00:45 2018 +0200
Synergy
---
.../scm/provider/synergy/util/SynergyCCMTest.java | 58 ++++++++++++----------
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java b/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
index a60ea59..59317b5 100644
--- a/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
+++ b/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
@@ -19,9 +19,9 @@ package org.apache.maven.scm.provider.synergy.util;
* under the License.
*/
-import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmTag;
import org.apache.maven.scm.ScmTestCase;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
@@ -124,18 +124,22 @@ public class SynergyCCMTest
* of testing.
*/
- Commandline cl = SynergyCCM.createTask( "the synopsis", "release", true, "CCM_ADDR" );
- assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
- String actual = cl.toString().replace( '\"', '\'' );
- String expected = "ccm task -create -synopsis 'the synopsis' -release release";
- assertTrue( "[" + actual + "] does not contain [" + expected + "]",
- actual.indexOf( expected ) > -1 );
-
- cl = SynergyCCM.createTask( "the synopsis", null, true, "CCM_ADDR" );
- actual = cl.toString().replace( '\"', '\'' );
- expected = "ccm task -create -synopsis 'the synopsis'";
- assertTrue( "[" + actual + "] does not contain [" + expected + "]",
- actual.indexOf( expected ) > -1 );
+ // This test is broken on non-Windows
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ {
+ Commandline cl = SynergyCCM.createTask( "the synopsis", "release", true, "CCM_ADDR" );
+ assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
+ String actual = cl.toString().replace( '\"', '\'' );
+ String expected = "ccm task -create -synopsis 'the synopsis' -release release";
+ assertTrue( "[" + actual + "] does not contain [" + expected + "]",
+ actual.indexOf( expected ) > -1 );
+
+ cl = SynergyCCM.createTask( "the synopsis", null, true, "CCM_ADDR" );
+ actual = cl.toString().replace( '\"', '\'' );
+ expected = "ccm task -create -synopsis 'the synopsis'";
+ assertTrue( "[" + actual + "] does not contain [" + expected + "]",
+ actual.indexOf( expected ) > -1 );
+ }
}
public void testCheckinTask()
@@ -393,7 +397,7 @@ public class SynergyCCMTest
Commandline cl = SynergyCCM.start( "user", "pass", SynergyRole.BUILD_MGR );
assertCommandLine( "ccm start -nogui -m -q -n user -pw pass -r build_mgr", null, cl );
}
-
+
public void testStartRemote()
throws Exception
{
@@ -416,23 +420,23 @@ public class SynergyCCMTest
assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
assertCommandLine( "ccm delimiter", null, cl );
}
-
+
public void testShowDefaultTask()
- throws Exception
+ throws Exception
{
- Commandline cl = SynergyCCM.showDefaultTask( "CCM_ADDR" );
- assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
- assertCommandLine( "ccm task -default", null, cl );
+ Commandline cl = SynergyCCM.showDefaultTask( "CCM_ADDR" );
+ assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
+ assertCommandLine( "ccm task -default", null, cl );
}
-
+
public void testSetDefaultTask()
- throws Exception
- {
- Commandline cl = SynergyCCM.setDefaultTask( 4711, "CCM_ADDR" );
- assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
- assertCommandLine( "ccm task -default 4711", null, cl );
- }
-
+ throws Exception
+ {
+ Commandline cl = SynergyCCM.setDefaultTask( 4711, "CCM_ADDR" );
+ assertTrue( "CCM_ADDR is not set.", assertContains( cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
+ assertCommandLine( "ccm task -default 4711", null, cl );
+ }
+
public boolean assertContains( String[] array, String value )
{
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.