Updated tests for Main because poms need group+artifact ceylon/ceylon…

…-module-resolver#87

test-jvm/com/redhat/ceylon/compiler/java/runtime/MANIFEST.MF

@@ -1,4 +1,4 @@
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: foo
+Bundle-SymbolicName: foo.foo
 Bundle-Version: 1
-Require-Bundle: a;bundle-version=1,b;bundle-version=2;visibility:=reexport,c;bundle-version=3;resolution:=optional
+Require-Bundle: a.a;bundle-version=1,b.b;bundle-version=2;visibility:=reexport,c.c;bundle-version=3;resolution:=optional

test-jvm/com/redhat/ceylon/compiler/java/runtime/MainTest.java

@@ -32,7 +32,7 @@ public class MainTest {
     public void testCeylonModule() throws IOException, ModuleNotFoundException{
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
-        File moduleFile = new File("test-jvm/foo", "module_.java");
+        File moduleFile = new File("test-jvm/foo/foo", "module_.java");
         Iterable<? extends JavaFileObject> units = fileManager.getJavaFileObjects(moduleFile);
         File destDir = new File("build/mainTest");
         FileUtil.delete(destDir);
@@ -41,10 +41,10 @@ public void testCeylonModule() throws IOException, ModuleNotFoundException{
         Boolean result = task.call();
         assertTrue(result != null && result.booleanValue());
 
-        File compiledModuleFile = new File(destDir, "foo/module_.class");
+        File compiledModuleFile = new File(destDir, "foo/foo/module_.class");
         assertTrue(compiledModuleFile.isFile());
 
-        File jar = jar(compiledModuleFile, "foo");
+        File jar = jar(compiledModuleFile, "foo/foo");
         checkJarDependencies(jar);
     }
 
@@ -71,13 +71,13 @@ public void testWrongOsgiModule() throws IOException, ModuleNotFoundException {
 
     @Test
     public void testJBossModuleXml() throws IOException, ModuleNotFoundException{
-        File jar = jar("module.xml", "META-INF/jbossmodules/foo/1");
+        File jar = jar("module.xml", "META-INF/jbossmodules/foo/foo/1");
         checkJarDependencies(jar);
     }
 
     @Test
     public void testJBossModuleProperties() throws IOException, ModuleNotFoundException{
-        File jar = jar("module.properties", "META-INF/jbossmodules/foo/1");
+        File jar = jar("module.properties", "META-INF/jbossmodules/foo/foo/1");
         checkJarDependencies(jar);
     }
 
@@ -86,14 +86,14 @@ private void checkJarDependencies(File jar) throws ModuleNotFoundException {
             ArrayList<File> jars = new ArrayList<File>(1);
             jars.add(jar);
             ClassPath classPath = new Main.ClassPath(jars);
-            Module module = classPath.loadModule("foo", "1");
+            Module module = classPath.loadModule("foo.foo", "1");
             assertNotNull(module);
-            assertEquals("foo", module.name());
+            assertEquals("foo.foo", module.name());
             assertEquals("1", module.version());
             assertEquals(3, module.dependencies.size());
-            assertTrue(module.dependencies.contains(new ClassPath.Dependency("a", "1", false, false)));
-            assertTrue(module.dependencies.contains(new ClassPath.Dependency("b", "2", false, true)));
-            assertTrue(module.dependencies.contains(new ClassPath.Dependency("c", "3", true, false)));
+            assertTrue(module.dependencies.contains(new ClassPath.Dependency("a.a", "1", false, false)));
+            assertTrue(module.dependencies.contains(new ClassPath.Dependency("b.b", "2", false, true)));
+            assertTrue(module.dependencies.contains(new ClassPath.Dependency("c.c", "3", true, false)));
         }finally{
 //            System.err.println("Jar is at "+jar.getAbsolutePath());
             jar.delete();

test-jvm/com/redhat/ceylon/compiler/java/runtime/module.properties

@@ -1,3 +1,3 @@
-a=1
-+b=2
-c?=3
+a.a=1
++b.b=2
+c.c?=3

test-jvm/com/redhat/ceylon/compiler/java/runtime/module.xml

@@ -22,14 +22,14 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.0" name="foo" slot="1">
+<module xmlns="urn:jboss:module:1.0" name="foo.foo" slot="1">
     <resources>
         <resource-root path="foo.jar"/>
     </resources>
 
     <dependencies>
-        <module name="a" slot="1"/>
-        <module name="b" slot="2" export="true"/>
-        <module name="c" slot="3" optional="true"/>
+        <module name="a.a" slot="1"/>
+        <module name="b.b" slot="2" export="true"/>
+        <module name="c.c" slot="3" optional="true"/>
     </dependencies>
 </module>

test-jvm/foo/foo/module_.java

@@ -0,0 +1,14 @@
+package foo.foo;
+
+import com.redhat.ceylon.compiler.java.metadata.Module;
+import com.redhat.ceylon.compiler.java.metadata.Import;
+
+@Module(name = "foo.foo",
+        version = "1", 
+        dependencies = {
+        @Import(name = "a.a", version = "1"),
+        @Import(name = "b.b", version = "2", export = true),
+        @Import(name = "c.c", version = "3", optional = true),
+})
+public class module_ {
+}