summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-07-20 10:49:34 -0400
committerSeth Tisue <seth@tisue.net>2015-07-20 10:49:34 -0400
commite84e06ca22c1fb77d3d4df82f322a8c6ee6c9569 (patch)
tree11a0c0e6884edfc34b808d9af5b3a766dcce7baa /test
parentd48b45bf6908f26d0c44cb6bc9e243d8e037ba93 (diff)
parent63a18ac35b70f01a7693f5b05f7176f22b38b3c1 (diff)
downloadscala-e84e06ca22c1fb77d3d4df82f322a8c6ee6c9569.tar.gz
scala-e84e06ca22c1fb77d3d4df82f322a8c6ee6c9569.tar.bz2
scala-e84e06ca22c1fb77d3d4df82f322a8c6ee6c9569.zip
Merge pull request #4632 from janekdb/2.11.x-names-t-v
Improve some names (t-v)
Diffstat (limited to 'test')
-rw-r--r--test/files/run/test-cpp.scala2
-rw-r--r--test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/test-cpp.scala b/test/files/run/test-cpp.scala
index 4e00e72658..4fca67d51e 100644
--- a/test/files/run/test-cpp.scala
+++ b/test/files/run/test-cpp.scala
@@ -46,7 +46,7 @@ object TestSetterInline {
* The access of the local variable 'y' should be replaced by the
* constant.
*/
-object TestAliasChainConstat {
+object TestAliasChainConstant {
def main(args: Array[String]): Unit = {
val x = 2
diff --git a/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala b/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala
index 13a955b55d..d17856eb54 100644
--- a/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala
+++ b/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala
@@ -10,7 +10,7 @@ import scala.tools.testing.AssertUtil._
@RunWith(classOf[JUnit4])
class HtmlDocletTest {
@Test
- def testSyntaxHighlightningUnicode() {
+ def testSyntaxHighlightingUnicode() {
val in = "unicode: …"
val out = SyntaxHigh(in).toString