diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-06 14:38:12 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-06 14:38:12 -0800 |
| commit | 332fec96e31840878bed41dd7b5314b97d8da7c2 (patch) | |
| tree | f6280c9e9aec6a56318476b8a1f90dae2417125d /test | |
| parent | 2969c53af1ed5bad39def14795ffeb8a0d910397 (diff) | |
| parent | 7dd56671c0afbb9e94497a47b99230ce2814fc8d (diff) | |
| download | scala-332fec96e31840878bed41dd7b5314b97d8da7c2.tar.gz scala-332fec96e31840878bed41dd7b5314b97d8da7c2.tar.bz2 scala-332fec96e31840878bed41dd7b5314b97d8da7c2.zip | |
Merge remote-tracking branch 'soc/scaladoc-spacing' into develop
Diffstat (limited to 'test')
| -rw-r--r-- | test/scaladoc/scala/html/HtmlFactoryTest.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala index adad3b6053..c8dad4cf48 100644 --- a/test/scaladoc/scala/html/HtmlFactoryTest.scala +++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala @@ -141,8 +141,8 @@ object Test extends Properties("HtmlFactory") { createTemplate("Trac4372.scala") match { case node: scala.xml.Node => { val html = node.toString - html.contains("<span class=\"name\" title=\"gt4s: $plus$colon\">+:</span>\n") && - html.contains("<span class=\"name\" title=\"gt4s: $minus$colon\">-:</span>\n") && + html.contains("<span class=\"name\" title=\"gt4s: $plus$colon\">+:</span>") && + html.contains("<span class=\"name\" title=\"gt4s: $minus$colon\">-:</span>") && html.contains("""<span class="params">(<span name="n">n: <span name="scala.Int" class="extype">Int</span></span>)</span><span class="result">: <span name="scala.Int" class="extype">Int</span></span>""") } case _ => false @@ -247,11 +247,11 @@ object Test extends Properties("HtmlFactory") { val lines = """ |type Bar = AnyRef { type Dingus <: T forSome { type T <: String } } |type Foo = AnyRef { ... /* 3 definitions in type refinement */ } - |def g (x: T forSome { type T <: String }): String - |def h (x: Float): AnyRef { def quux(x: Int,y: Int): Int } - |def hh (x: Float): AnyRef { def quux(x: Int,y: Int): Int } - |def j (x: Int): Bar - |def k (): AnyRef { type Dingus <: T forSome { type T <: String } } + |def g(x: T forSome { type T <: String }): String + |def h(x: Float): AnyRef { def quux(x: Int,y: Int): Int } + |def hh(x: Float): AnyRef { def quux(x: Int,y: Int): Int } + |def j(x: Int): Bar + |def k(): AnyRef { type Dingus <: T forSome { type T <: String } } """.stripMargin.trim.lines map (_.trim) files("RefinementAndExistentials.html") match { |