SI-1118:

* Use new-style deprecation annotations
* Slightly less cutesy test text
* Move t1118.scala to the right directory

3 files changed, 31 insertions, 31 deletions

diff --git a/test/files/jvm/deprecation/t1118.scala b/test/files/jvm/deprecation/t1118.scala
deleted file mode 100755
index 4464e51f89..0000000000
--- a/test/files/jvm/deprecation/t1118.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-import scala.xml._

-

-object Test {

-  def main(args: Array[String]) {

-    println(<xml:group>

-<hi/> <!-- literal short -->

-<there></there> <!-- literal long -->

-<guys who="you all"></guys> <!-- literal long with attribute-->

-<hows it="going"/> <!-- literal short with attribute -->

-<this>scala stuff is pretty cool</this> <!-- literal not empty -->

-</xml:group>)

-

-    println(Elem(null, "bob", Null, TopScope, false) ++ Text(" ") ++ Comment("programmatic long"))

-

-    println(Elem(null, "dobbs", Null, TopScope, true) ++ Text(" ") ++ Comment("programmatic short"))

-

-    println(Elem(null, "is", Attribute("really", Text("yep"), Null), TopScope, true) ++ Text(" ") ++ Comment ("programmatic short with attribute"))

-

-    println(Elem(null, "slack", Attribute("sing", Text("it"), Null), TopScope, false) ++ Text(" ") ++ Comment ("programmatic long with attribute"))

-  }

-}
\ No newline at end of file
diff --git a/test/files/jvm/t1118.check b/test/files/jvm/t1118.check
index f8a17e0195..b246dc6fb9 100755
--- a/test/files/jvm/t1118.check
+++ b/test/files/jvm/t1118.check
@@ -1,10 +1,10 @@
-<hi/> <!-- literal short -->

-<there></there> <!-- literal long -->

-<guys who="you all"></guys> <!-- literal long with attribute-->

-<hows it="going"/> <!-- literal short with attribute -->

-<this>scala stuff is pretty cool</this> <!-- literal not empty -->

-

-<bob></bob> <!--programmatic long-->

-<dobbs/> <!--programmatic short-->

-<is really="yep"/> <!--programmatic short with attribute-->

-<slack sing="it"></slack> <!--programmatic long with attribute-->
\ No newline at end of file
+<hi/> <!-- literal short -->
+<there></there> <!-- literal long -->
+<guys who="you all"></guys> <!-- literal long with attribute-->
+<hows it="going"/> <!-- literal short with attribute -->
+<this>is pretty cool</this> <!-- literal not empty -->
+
+<emptiness></emptiness> <!--programmatic long-->
+<vide/> <!--programmatic short-->
+<elem attr="value"/> <!--programmatic short with attribute-->
+<elem2 attr2="value2"></elem2> <!--programmatic long with attribute-->
\ No newline at end of file
diff --git a/test/files/jvm/t1118.scala b/test/files/jvm/t1118.scala
new file mode 100755
index 0000000000..3c86547241
--- /dev/null
+++ b/test/files/jvm/t1118.scala
@@ -0,0 +1,21 @@
+import scala.xml._
+
+object Test {
+  def main(args: Array[String]) {
+    println(<xml:group>
+<hi/> <!-- literal short -->
+<there></there> <!-- literal long -->
+<guys who="you all"></guys> <!-- literal long with attribute-->
+<hows it="going"/> <!-- literal short with attribute -->
+<this>is pretty cool</this> <!-- literal not empty -->
+</xml:group>)
+
+    println(Elem(null, "emptiness", Null, TopScope, false) ++ Text(" ") ++ Comment("programmatic long"))
+
+    println(Elem(null, "vide", Null, TopScope, true) ++ Text(" ") ++ Comment("programmatic short"))
+
+    println(Elem(null, "elem", Attribute("attr", Text("value"), Null), TopScope, true) ++ Text(" ") ++ Comment ("programmatic short with attribute"))
+
+    println(Elem(null, "elem2", Attribute("attr2", Text("value2"), Null), TopScope, false) ++ Text(" ") ++ Comment ("programmatic long with attribute"))
+  }
+}
\ No newline at end of file