Skip to content

Commit 08916d1

Browse files
paulpadriaanm
paulp
authored and
adriaanm
committed
Renamed tests named bugXXX to tXXX, no review.
1 parent 289c5e9 commit 08916d1

26 files changed

+496
-0
lines changed

‎test/files/jvm/t560bis.check

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cool!
2+
cool!

‎test/files/jvm/t560bis.scala

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
object Test {
2+
import scala.xml._;
3+
4+
def bar(args: Seq[String]) = args match {
5+
case Seq(a,b,c,d @ _*) => Console.println("cool!")
6+
case _ => Console.println("bah")
7+
}
8+
def foo(args: List[String]) =
9+
Elem(null,"bla",Null, TopScope, (args map {x => Text(x)}):_*) match {
10+
case Elem(_,_,_,_,Text("1"),_*) =>
11+
Console.println("cool!")
12+
case _ =>
13+
Console.println("bah")
14+
}
15+
16+
def main(args: Array[String]) = {
17+
val li = List("1","2","3","4")
18+
bar(li)
19+
foo(li)
20+
}
21+
}

‎test/files/neg/t1011.check

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
t1011.scala:8: error: not found: value entity
2+
<dl><code>{Text(entity)}</code>
3+
^
4+
one error found

‎test/files/neg/t1011.scala

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
package test;
2+
import scala.xml._;
3+
4+
abstract class Test {
5+
//val entity : String;
6+
def primitiveHeader : NodeSeq =
7+
Group({
8+
<dl><code>{Text(entity)}</code>
9+
<code>{Text(entity)}</code>
10+
<code>{Text(entity)}</code>
11+
<code>{Text(entity)}</code>
12+
<code>{Text(entity)}</code>
13+
<code>{Text(entity)}</code>
14+
<code>{Text(entity)}</code>
15+
<code>{Text(entity)}</code>
16+
<code>{Text(entity)}</code>
17+
<code>{Text(entity)}</code>
18+
<code>{Text(entity)}</code>
19+
<code>{Text(entity)}</code>
20+
<code>{Text(entity)}</code>
21+
<code>{Text(entity)}</code>
22+
<code>{Text(entity)}</code>
23+
<code>{Text(entity)}</code>
24+
<code>{Text(entity)}</code>
25+
<code>{Text(entity)}</code>
26+
<code>{Text(entity)}</code>
27+
<code>{Text(entity)}</code>
28+
<code>{Text(entity)}</code>
29+
<code>{Text(entity)}</code>
30+
<code>{Text(entity)}</code>
31+
<code>{Text(entity)}</code>
32+
<code>{Text(entity)}</code>
33+
<code>{Text(entity)}</code>
34+
<code>{Text(entity)}</code>
35+
<code>{Text(entity)}</code>
36+
<code>{Text(entity)}</code>
37+
<code>{Text(entity)}</code>
38+
<code>{Text(entity)}</code>
39+
<code>{Text(entity)}</code>
40+
<code>{Text(entity)}</code>
41+
<code>{Text(entity)}</code>
42+
<code>{Text(entity)}</code>
43+
<code>{Text(entity)}</code>
44+
<code>{Text(entity)}</code>
45+
<code>{Text(entity)}</code>
46+
<code>{Text(entity)}</code>
47+
<code>{Text(entity)}</code>
48+
<code>{Text(entity)}</code>
49+
<code>{Text(entity)}</code>
50+
<code>{Text(entity)}</code>
51+
<code>{Text(entity)}</code>
52+
<code>{Text(entity)}</code>
53+
<code>{Text(entity)}</code>
54+
<code>{Text(entity)}</code>
55+
<code>{Text(entity)}</code>
56+
<code>{Text(entity)}</code>
57+
<code>{Text(entity)}</code>
58+
<code>{Text(entity)}</code>
59+
<code>{Text(entity)}</code>
60+
<code>{Text(entity)}</code>
61+
<code>{Text(entity)}</code>
62+
<code>{Text(entity)}</code>
63+
<code>{Text(entity)}</code>
64+
<code>{Text(entity)}</code>
65+
<code>{Text(entity)}</code>
66+
<code>{Text(entity)}</code>
67+
<code>{Text(entity)}</code>
68+
<code>{Text(entity)}</code>
69+
<code>{Text(entity)}</code>
70+
<code>{Text(entity)}</code>
71+
<code>{Text(entity)}</code>
72+
<code>{Text(entity)}</code>
73+
<code>{Text(entity)}</code>
74+
<code>{Text(entity)}</code>
75+
<code>{Text(entity)}</code>
76+
<code>{Text(entity)}</code></dl>
77+
} ++ // 3 seconds
78+
{}++ // 5 seconds
79+
{}++ // 10 seconds
80+
{}++ // 20 seconds
81+
{}++ // 40 seconds
82+
{}++ // 40 seconds
83+
{}++ // 40 seconds
84+
{}++ // 40 seconds
85+
{}++ // 40 seconds
86+
{}++ // 40 seconds
87+
{}++ // 40 seconds
88+
{}++ // 40 seconds
89+
{}++ // 40 seconds
90+
{}++ // 40 seconds
91+
{}++ // 40 seconds
92+
{}++ // 40 seconds
93+
{}++ // 40 seconds
94+
{}++ // 5 seconds
95+
{}++ // 10 seconds
96+
{}++ // 20 seconds
97+
{}++ // 40 seconds
98+
{}++ // 40 seconds
99+
{}++ // 40 seconds
100+
{}++ // 40 seconds
101+
{}++ // 40 seconds
102+
{}++ // 40 seconds
103+
{}++ // 40 seconds
104+
{}++ // 40 seconds
105+
{}++ // 40 seconds
106+
{}++ // 40 seconds
107+
{}++ // 40 seconds
108+
{}++ // 40 seconds
109+
{}++ // 40 seconds
110+
{}++ // 5 seconds
111+
{}++ // 10 seconds
112+
{}++ // 20 seconds
113+
{}++ // 40 seconds
114+
{}++ // 40 seconds
115+
{}++ // 40 seconds
116+
{}++ // 40 seconds
117+
{}++ // 40 seconds
118+
{}++ // 40 seconds
119+
{}++ // 40 seconds
120+
{}++ // 40 seconds
121+
{}++ // 40 seconds
122+
{}++ // 40 seconds
123+
{}++ // 40 seconds
124+
{}++ // 40 seconds
125+
{}++ // 40 seconds
126+
<hr/>);
127+
}

‎test/files/neg/t1017.check

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
t1017.scala:3: error: not found: value foo
2+
<x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x>{ foo }</x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x>
3+
^
4+
one error found

‎test/files/neg/t1017.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 'foo' is not defined
2+
object Test {
3+
<x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x><x>{ foo }</x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x></x>
4+
}

‎test/files/pos/t0422.scala

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import scala.util.regexp.WordExp;
2+
import scala.util.automata.WordBerrySethi;
3+
4+
object BoolWordExp extends WordExp {
5+
type _labelT = MyLabels;
6+
type _regexpT = RegExp;
7+
abstract class MyLabels extends Label ;
8+
case class MyLabel(c:Char) extends MyLabels;
9+
}
10+
11+
object MyTranslator extends WordBerrySethi {
12+
override val lang = BoolWordExp;
13+
import lang._;
14+
override protected def seenLabel( r:RegExp, i:Int, label: _labelT ): Unit = {
15+
super.seenLabel(r,i,label)
16+
}
17+
}

‎test/files/pos/t0646.scala

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
object xfor {
2+
3+
import scala.xml.NodeSeq
4+
5+
val books =
6+
<bks>
7+
<title>Blabla</title>
8+
<title>Blubabla</title>
9+
<title>Baaaaaaalabla</title>
10+
</bks>;
11+
12+
new NodeSeq { val theSeq = books.child } match {
13+
case t @ Seq(<title>Blabla</title>) => t
14+
}
15+
16+
//val n: NodeSeq = new NodeSeq { val theSeq = books.child }
17+
//n match {
18+
// case t @ <title>Blabla</title> => t
19+
//}
20+
21+
}

‎test/files/pos/t1014.scala

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import scala.xml.{NodeSeq, Elem}
2+
3+
class EO extends App with Moo{
4+
def cat = <cat>dog</cat>
5+
6+
implicit def nodeSeqToFlog(in: Elem): Flog = new Flog(in)
7+
}
8+
9+
trait Moo {
10+
def cat: Flog
11+
}
12+
13+
class Flog(val in: NodeSeq)

‎test/files/pos/t1626.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
object o {
2+
val n = <a xmlns=""/>
3+
n.namespace == null
4+
}

‎test/files/pos/t2281.scala

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import scala.collection.mutable.ArrayBuffer
2+
3+
class A {
4+
def f(x: Boolean) = if (x) <br/><br/> else <br/>
5+
}
6+
7+
class B {
8+
def splitSentences(text : String) : ArrayBuffer[String] = {
9+
val outarr = new ArrayBuffer[String]
10+
var outstr = new StringBuffer
11+
var prevspace = false
12+
val ctext = text.replaceAll("\n+","\n")
13+
ctext foreach {c =>
14+
outstr append c
15+
if(c == '.' || c == '!' || c == '?' || c == '\n' || c == ':' || c == ';' || (prevspace && c == '-') ){
16+
outarr += outstr.toString
17+
outstr = new StringBuffer
18+
}
19+
if(c == '\n'){
20+
outarr += "\n\n"
21+
}
22+
prevspace = c == ' '
23+
}
24+
if(outstr.length > 0){
25+
outarr += outstr.toString
26+
}
27+
outarr
28+
}
29+
30+
def spanForSentence(x : String,picktext : String) =
31+
if(x == "\n\n"){
32+
<br/><br/>
33+
}else{
34+
<span class='clicksentence' style={if(x == picktext) "background-color: yellow" else ""}>{x}</span>
35+
}
36+
37+
def selectableSentences(text : String, picktext : String) = {
38+
val sentences = splitSentences(text)
39+
sentences.map(x => spanForSentence(x,picktext))
40+
}
41+
}

‎test/files/pos/t715/meredith_1.scala

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
package com.sap.dspace.model.othello;
2+
3+
import scala.xml._
4+
5+
trait XMLRenderer {
6+
type T <: {def getClass() : java.lang.Class[_]}
7+
val valueTypes =
8+
List(
9+
classOf[java.lang.Boolean],
10+
classOf[java.lang.Integer],
11+
classOf[java.lang.Float],
12+
classOf[java.lang.String]
13+
// more to come
14+
)
15+
16+
def value2XML(
17+
value : Object,
18+
field : java.lang.reflect.Field,
19+
pojo : T
20+
) : Node = {
21+
value match {
22+
case null => Text( "null" )
23+
case vUnmatched =>
24+
if (value.isInstanceOf[java.lang.Boolean])
25+
Text( value.asInstanceOf[java.lang.Boolean].toString )
26+
else if (value.isInstanceOf[java.lang.Integer])
27+
Text( value.asInstanceOf[java.lang.Integer].toString )
28+
else if (value.isInstanceOf[java.lang.Float])
29+
Text( value.asInstanceOf[java.lang.Float].toString )
30+
// else if (value.isInstanceOf[T])
31+
// pojo2XML( value.asInstanceOf[T] )
32+
else
33+
<unmatchedType>
34+
<theType>
35+
{vUnmatched.getClass.toString}
36+
</theType>
37+
<theValue>
38+
{vUnmatched.toString}
39+
</theValue>
40+
</unmatchedType>
41+
}
42+
}
43+
44+
def field2XML(
45+
field : java.lang.reflect.Field,
46+
pojo : T
47+
) : Elem = {
48+
49+
val accessible = field.isAccessible;
50+
field.setAccessible( true );
51+
// BUGBUG lgm need to disambiguate on type and possibly make
52+
// recursive call to pojo2XML
53+
val fldValXML = value2XML( field.get( pojo ), field, pojo );
54+
field.setAccessible( accessible );
55+
56+
Elem(
57+
null,
58+
field.getName,
59+
null,
60+
TopScope,
61+
fldValXML
62+
)
63+
}
64+
65+
def pojo2XML( pojo : T ) : Elem = {
66+
val progeny =
67+
for (field <- pojo.getClass.getDeclaredFields)
68+
yield field2XML( field, pojo );
69+
70+
Elem(
71+
null,
72+
pojo.getClass.getName,
73+
null,
74+
TopScope,
75+
progeny.asInstanceOf[Array[scala.xml.Node]] : _*
76+
)
77+
}
78+
}
79+
80+
case class POJO2XMLRenderer( recurse : Boolean )
81+
extends XMLRenderer {
82+
type T = java.io.Serializable
83+
override def value2XML(
84+
value : Object,
85+
field : java.lang.reflect.Field,
86+
pojo : java.io.Serializable
87+
) : Node = {
88+
if (recurse) super.value2XML( value, field, pojo )
89+
else Text( value + "" )
90+
}
91+
}
92+
93+
object thePOJO2XMLRenderer extends POJO2XMLRenderer( true ) {
94+
}
95+
96+
object Test extends Application {
97+
println(com.sap.dspace.model.othello.thePOJO2XMLRenderer)
98+
}

‎test/files/pos/t715/runner_2.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
object Test extends Application {
2+
println(com.sap.dspace.model.othello.thePOJO2XMLRenderer)
3+
}

‎test/files/pos/t880.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import scala.xml.Null
2+
3+
class Test[A >: Null]
4+
{
5+
val x : A = null
6+
}

‎test/files/run/t1079.check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
false

‎test/files/run/t1079.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
object Test extends App {
2+
println(<t user:tag=""/> == <t user:tag="X"/>)
3+
}

‎test/files/run/t2124.check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<p><lost></lost><q></q></p>

0 commit comments

Comments
 (0)