You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/12/24 15:36:27 UTC
[maven-scm] branch warn created (now 8f4d683)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
at 8f4d683 fix wrong argument type for equals
This branch includes the following new commits:
new 743266e fix wrong argument type for equals
new 8f4d683 fix wrong argument type for equals
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-scm] 02/02: fix wrong argument type for equals
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 8f4d6837d645c4de3c807db3036feeb758dfda45
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Dec 24 10:36:11 2020 -0500
fix wrong argument type for equals
---
.../provider/tfs/command/TfsCheckOutCommandTest.java | 18 ++++++++++++++++--
.../scm/provider/tfs/command/TfsUpdateCommandTest.java | 17 +++++++++++++++--
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommandTest.java b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommandTest.java
index e97cc89..2a7a4c7 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommandTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.tfs.command;
*/
import java.io.File;
+import java.io.IOException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
@@ -41,8 +42,7 @@ public class TfsCheckOutCommandTest
consumer = new FileListConsumer();
}
- public void testCommandline()
- throws Exception
+ public void testCommandLine() throws IOException
{
TfsScmProviderRepository repo = getScmProviderRepository();
ScmRevision rev = new ScmRevision( "revision" );
@@ -51,6 +51,20 @@ public class TfsCheckOutCommandTest
String expected = "tf get -login:user,password -recursive -force -version:Crevision " + path;
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
+
+
+ public void testCommandLine_emptyName() throws IOException
+ {
+ TfsScmProviderRepository repo = getScmProviderRepository();
+ ScmRevision rev = new ScmRevision( "" );
+ String path = getScmFileSet().getBasedir().getAbsolutePath();
+ Commandline cmd =
+ new TfsCheckOutCommand().createGetCommand( repo, getScmFileSet(), rev, true ).getCommandline();
+ String expected = "tf get -login:user,password -recursive -force " + path;
+ assertCommandLine( expected, getWorkingDirectory(), cmd );
+ }
+
+
public void testCommand()
{
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommandTest.java b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommandTest.java
index 8587e75..84a384d 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommandTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.scm.provider.tfs.command;
+import java.io.IOException;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,8 +29,8 @@ public class TfsUpdateCommandTest
extends TfsCommandTest
{
- public void testCommandline()
- throws Exception
+ public void testCommandLine()
+ throws IOException
{
TfsScmProviderRepository repo = getScmProviderRepository();
ScmRevision rev = new ScmRevision( "revision" );
@@ -37,5 +39,16 @@ public class TfsUpdateCommandTest
String expected = "tf get -login:user,password " + path + " -version:Crevision";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
+
+ public void testCommandLine_emptyName()
+ throws IOException
+ {
+ TfsScmProviderRepository repo = getScmProviderRepository();
+ ScmRevision rev = new ScmRevision( "" );
+ Commandline cmd = new TfsUpdateCommand().createCommand( repo, getScmFileSet(), rev ).getCommandline();
+ String path = repo.getServerPath();
+ String expected = "tf get -login:user,password " + path;
+ assertCommandLine( expected, getWorkingDirectory(), cmd );
+ }
}
[maven-scm] 01/02: fix wrong argument type for equals
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch warn
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 743266ec740e9cf833a7fe84cf39e8c29d095eb8
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Dec 24 10:35:55 2020 -0500
fix wrong argument type for equals
---
.../org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java | 2 +-
.../org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
index 7aa5e77..58e626f 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommand.java
@@ -101,7 +101,7 @@ public class TfsCheckOutCommand
command.addArgument( "-force" );
- if ( v != null && !v.equals( "" ) )
+ if ( v != null && !v.getName().isEmpty() )
{
String vType = "";
if ( v.getType().equals( "Tag" ) )
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
index 6fe6b09..f212902 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommand.java
@@ -58,7 +58,7 @@ public class TfsUpdateCommand
String serverPath = ( (TfsScmProviderRepository) r ).getServerPath();
TfsCommand command = new TfsCommand( "get", r, f, getLogger() );
command.addArgument( serverPath );
- if ( v != null && !v.equals( "" ) )
+ if ( v != null && !v.getName().isEmpty() )
{
String vType = "";
if ( v.getType().equals( "Tag" ) )