averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove overloads that were needed pre-conditional conformance

Browse Source
This commit is contained in:
Ben Cohen
2018-09-11 21:00:36 -07:00
parent d414ece556
commit e338344bae
19 changed files with 131 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/stdlib/InputStream.swift.gyb
View File

@@ -30,13 +30,13 @@ var ReadLineTestSuite = TestSuite("ReadLine")
ReadLineTestSuite.test("EmptyLine/strippingNewline=${strip_newline}")
.stdin("\n")
.code {
expectOptionalEqual("${newline}", readLine(strippingNewline: ${strip_newline}))
expectEqual("${newline}", readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("Whitespace/strippingNewline=${strip_newline}")
.stdin(" \t\u{0b}\u{0c}\u{85}\u{2028}\u{2029}\n")
.code {
expectOptionalEqual(
expectEqual(
" \t\u{0b}\u{0c}\u{85}\u{2028}\u{2029}${newline}",
readLine(strippingNewline: ${strip_newline}))
}
@@ -44,19 +44,19 @@ ReadLineTestSuite.test("Whitespace/strippingNewline=${strip_newline}")
ReadLineTestSuite.test("ASCII/length=1/strippingNewline=${strip_newline}")
.stdin("a\n")
.code {
expectOptionalEqual("a${newline}", readLine(strippingNewline: ${strip_newline}))
expectEqual("a${newline}", readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("ASCII/length=2/strippingNewline=${strip_newline}")
.stdin("ab\n")
.code {
expectOptionalEqual("ab${newline}", readLine(strippingNewline: ${strip_newline}))
expectEqual("ab${newline}", readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("ASCII/length=3/strippingNewline=${strip_newline}")
.stdin("abc\n")
.code {
expectOptionalEqual("abc${newline}", readLine(strippingNewline: ${strip_newline}))
expectEqual("abc${newline}", readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("Unicode/strippingNewline=${strip_newline}")
@@ -69,7 +69,7 @@ ReadLineTestSuite.test("Unicode/strippingNewline=${strip_newline}")
// U+1F425 FRONT-FACING BABY CHICK
.stdin("\u{0065}\u{00a9}\u{0521}\u{304b}\u{3099}\u{4587}\u{1f425}\u{10b9c4}\n")
.code {
expectOptionalEqual(
expectEqual(
"\u{0065}\u{00a9}\u{0521}\u{304b}\u{3099}\u{4587}\u{1f425}\u{10b9c4}${newline}",
readLine(strippingNewline: ${strip_newline}))
}
@@ -83,20 +83,20 @@ ReadLineTestSuite.test("EOF/1/strippingNewline=${strip_newline}")
ReadLineTestSuite.test("EOF/2/strippingNewline=${strip_newline}")
.stdin("abcd 123\n", eof: true)
.code {
expectOptionalEqual("abcd 123${newline}", readLine(strippingNewline: ${strip_newline}))
expectEqual("abcd 123${newline}", readLine(strippingNewline: ${strip_newline}))
expectNil(readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("MissingNewlineAtEOF/1/strippingNewline=${strip_newline}")
.stdin("a", eof: true)
.code {
expectOptionalEqual("a", readLine(strippingNewline: ${strip_newline}))
expectEqual("a", readLine(strippingNewline: ${strip_newline}))
}
ReadLineTestSuite.test("MissingNewlineAtEOF/2/strippingNewline=${strip_newline}")
.stdin("abcd 123", eof: true)
.code {
expectOptionalEqual("abcd 123", readLine(strippingNewline: ${strip_newline}))
expectEqual("abcd 123", readLine(strippingNewline: ${strip_newline}))
}
% end
@@ -105,45 +105,45 @@ ReadLineTestSuite.test("strippingNewline=default")
.stdin("abcd 123\n")
.code {
// Check that the default for strippingNewline is true.
expectOptionalEqual("abcd 123", readLine())
expectEqual("abcd 123", readLine())
}
ReadLineTestSuite.test("StripNewline/JustCR")
.stdin("\r", eof: true)
.code {
// FIXME: CR by itself is not recognized as a newline.
expectOptionalEqual("\r", readLine(strippingNewline: true))
expectEqual("\r", readLine(strippingNewline: true))
}
ReadLineTestSuite.test("StripNewline/JustLF")
.stdin("\n")
.code {
expectOptionalEqual("", readLine(strippingNewline: true))
expectEqual("", readLine(strippingNewline: true))
}
ReadLineTestSuite.test("StripNewline/JustCR+LF")
.stdin("\r\n")
.code {
expectOptionalEqual("", readLine(strippingNewline: true))
expectEqual("", readLine(strippingNewline: true))
}
ReadLineTestSuite.test("StripNewline/CR")
.stdin("abcd 123\r", eof: true)
.code {
// FIXME: CR by itself is not recognized as a newline.
expectOptionalEqual("abcd 123\r", readLine(strippingNewline: true))
expectEqual("abcd 123\r", readLine(strippingNewline: true))
}
ReadLineTestSuite.test("StripNewline/LF")
.stdin("abcd 123\n")
.code {
expectOptionalEqual("abcd 123", readLine(strippingNewline: true))
expectEqual("abcd 123", readLine(strippingNewline: true))
}
ReadLineTestSuite.test("StripNewline/CR+LF")
.stdin("abcd 123\r\n")
.code {
expectOptionalEqual("abcd 123", readLine(strippingNewline: true))
expectEqual("abcd 123", readLine(strippingNewline: true))
}
runAllTests()