luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #369 from MasseGuillaume/credentials-toString-bug 

Dont quote realm if it's null in Credentials.toString
This commit is contained in:
eugene yokota 2021-03-09 00:18:48 -05:00 committed by GitHub
parent 0028ecf058 956e8483f5
commit b280c2b0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
View File

@ -88,5 +88,11 @@ final class DirectCredentials(
val userName: String,
val passwd: String
) extends Credentials {
override def toString = s"""DirectCredentials("$realm", "$host", "$userName", ****)"""
override def toString = {
val dq = '"'
val r =
if (realm == null) "null"
else dq + realm + dq
s"""DirectCredentials($r, "$host", "$userName", ****)"""
}
}

12
ivy/src/test/scala/sbt/internal/librarymanagement/CredentialsSpec.scala
View File

@ -25,4 +25,16 @@ class CredentialsSpec extends AnyFunSuite {
credentialsFile.delete()
}
test("DirectCredentials.toString") {
assert(
Credentials(realm = null, host = "example.org", userName = "username", passwd = "password").toString ==
"""DirectCredentials(null, "example.org", "username", ****)"""
)
assert(
Credentials(realm = "realm", host = "example.org", userName = "username", passwd = "password").toString ==
"""DirectCredentials("realm", "example.org", "username", ****)"""
)
}
}