summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-05-28 15:34:32 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-05-28 15:34:32 +0000
commit0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47 (patch)
treed506f42b6847b9ece5240d062bb9e4b97a450019 /test/files/run
parent5da8a164cdd276e191ab6429e5a64e02529bbe45 (diff)
downloadscala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.gz
scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.bz2
scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.zip
Re-enabled a number of previously disabled tests;
according to my tests, they all currently work.
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/json.scala (renamed from test/files/run/json.scala.disabled)8
-rw-r--r--test/files/run/stream_length.check1
-rw-r--r--test/files/run/stream_length.scala15
3 files changed, 20 insertions, 4 deletions
diff --git a/test/files/run/json.scala.disabled b/test/files/run/json.scala
index 2e7ee4aa4d..ec0bad7ebe 100644
--- a/test/files/run/json.scala.disabled
+++ b/test/files/run/json.scala
@@ -8,7 +8,7 @@ object Test extends Application {
printJSON("{\"name\": \"va1ue\"}") // ticket #136
printJSON("{\"name\": { \"name1\": \"va1ue1\", \"name2\": \"va1ue2\" } }")
printJSON("{\"name\": \"\\u0022\"}")
- printJSON("{\"age\": 0}")
+ printJSON("{\"age\": 0}")
println
// from http://en.wikipedia.org/wiki/JSON
@@ -63,7 +63,7 @@ object Test extends Application {
// from http://json.org/example.html
val sample3 = """
{"web-app": {
- "servlet": [
+ "servlet": [
{
"servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet",
@@ -119,7 +119,7 @@ object Test extends Application {
{
"servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"},
-
+
{
"servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"},
@@ -146,7 +146,7 @@ object Test extends Application {
"cofaxAdmin": "/admin/*",
"fileServlet": "/static/*",
"cofaxTools": "/tools/*"},
-
+
"taglib": {
"taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}
diff --git a/test/files/run/stream_length.check b/test/files/run/stream_length.check
new file mode 100644
index 0000000000..9906de773c
--- /dev/null
+++ b/test/files/run/stream_length.check
@@ -0,0 +1 @@
+Length: 970299
diff --git a/test/files/run/stream_length.scala b/test/files/run/stream_length.scala
new file mode 100644
index 0000000000..68e9cad5ac
--- /dev/null
+++ b/test/files/run/stream_length.scala
@@ -0,0 +1,15 @@
+
+
+object Test {
+ def walk(depth: Int, bias: String): Stream[String] = {
+ if (depth == 0)
+ Stream(bias)
+ else {
+ Stream.concat(Stream.range(1, 100).map((x: Int) => walk(depth-1, bias + x)))
+ }
+ }
+
+ def main(args: Array[String]) {
+ println("Length: " + walk(3, "---").length)
+ }
+}