Fixed tests for #2110

ceylon · Mar 30, 2015 · 0b177ac · 0b177ac
1 parent dbd4a8f
commit 0b177ac
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/test/src/com/redhat/ceylon/compiler/java/test/annotations/module.src b/test/src/com/redhat/ceylon/compiler/java/test/annotations/module.src
@@ -15,7 +15,10 @@ package com.redhat.ceylon.compiler.java.test.annotations;
                         version = "7"),
                 @.com.redhat.ceylon.compiler.java.metadata.Import(
                         name = "javax.xml",
-                        version = "7")})
+                        version = "7"),
+                @.com.redhat.ceylon.compiler.java.metadata.Import(
+                        name = "ceylon.language",
+                        version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "Bla bla.")
 @.ceylon.language.AuthorsAnnotation$annotation$(authors = {
         "Stef FroMage",

diff --git a/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/a/module.src b/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/a/module.src
@@ -7,7 +7,9 @@ package com.redhat.ceylon.compiler.java.test.annotations.modules.a;
         license = "http://www.apache.org/licenses/LICENSE-2.0.html",
         by = {"Tom"},
         version = "0.1",
-        dependencies = {})
+        dependencies = {@.com.redhat.ceylon.compiler.java.metadata.Import(
+                name = "ceylon.language",
+                version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "Module A doc")
 @.ceylon.language.AuthorsAnnotation$annotation$(authors = "Tom")
 @.ceylon.language.LicenseAnnotation$annotation$(description = "http://www.apache.org/licenses/LICENSE-2.0.html")

diff --git a/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/b/module.src b/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/b/module.src
@@ -5,7 +5,9 @@ package com.redhat.ceylon.compiler.java.test.annotations.modules.b;
         name = "com.redhat.ceylon.compiler.java.test.annotations.modules.b",
         doc = "Module B doc",
         version = "0.1",
-        dependencies = {})
+        dependencies = {@.com.redhat.ceylon.compiler.java.metadata.Import(
+                name = "ceylon.language",
+                version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "Module B doc")
 final class $module_ {
 

diff --git a/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/c/module.src b/test/src/com/redhat/ceylon/compiler/java/test/annotations/modules/c/module.src
@@ -16,6 +16,9 @@ package com.redhat.ceylon.compiler.java.test.annotations.modules.c;
                         optional = true),
                 @.com.redhat.ceylon.compiler.java.metadata.Import(
                         name = "com.redhat.ceylon.module-resolver",
+                        version = "1.1.1"),
+                @.com.redhat.ceylon.compiler.java.metadata.Import(
+                        name = "ceylon.language",
                         version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "Module C doc, with imports!")
 final class $module_ {

diff --git a/test/src/com/redhat/ceylon/compiler/java/test/issues/bug04xx/bug493/module.src b/test/src/com/redhat/ceylon/compiler/java/test/issues/bug04xx/bug493/module.src
@@ -6,7 +6,9 @@ package com.redhat.ceylon.compiler.java.test.issues.bug04xx.bug493;
         doc = "A JSON parser / serialiser",
         by = {"St\u00e9phane \u00c9pardaud"},
         version = "1",
-        dependencies = {})
+        dependencies = {@.com.redhat.ceylon.compiler.java.metadata.Import(
+                name = "ceylon.language",
+                version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "A JSON parser / serialiser")
 @.ceylon.language.AuthorsAnnotation$annotation$(authors = "St\u00e9phane \u00c9pardaud")
 final class $module_ {

diff --git a/test/src/com/redhat/ceylon/compiler/java/test/structure/modules/single/module.src b/test/src/com/redhat/ceylon/compiler/java/test/structure/modules/single/module.src
@@ -7,7 +7,9 @@ package com.redhat.ceylon.compiler.java.test.structure.modules.single;
         license = "http://www.gnu.org/licenses/gpl.html",
         by = {"Stef FroMage"},
         version = "6.6.6",
-        dependencies = {})
+        dependencies = {@.com.redhat.ceylon.compiler.java.metadata.Import(
+                name = "ceylon.language",
+                version = "1.1.1")})
 @.ceylon.language.DocAnnotation$annotation$(description = "Bla bla.")
 @.ceylon.language.AuthorsAnnotation$annotation$(authors = "Stef FroMage")
 @.ceylon.language.LicenseAnnotation$annotation$(description = "http://www.gnu.org/licenses/gpl.html")

diff --git a/test/src/com/redhat/ceylon/tools/test/InfoToolTests.java b/test/src/com/redhat/ceylon/tools/test/InfoToolTests.java
@@ -78,11 +78,7 @@ public void testModuleFromSource() throws Exception {
                 "Origin:      Local source folder\n"+
                 "Dependency Tree (up to depth 1):\n"+
                 "  shared java.base/7\n"+
-                "  optional java.desktop/7\n"+
-                "\n"+
-                "Dependencies (up to depth 1):\n"+
-                "  java.base/7\n"+
-                "  java.desktop/7\n"
+                "  optional java.desktop/7\n"
         ));
     }