Skip to content

Commit

Permalink
Fix on-demand test.
Browse files Browse the repository at this point in the history
  • Loading branch information
alesj committed Dec 10, 2011
1 parent 75b2fd0 commit c70a555
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ protected ModuleSpec findModule(ModuleIdentifier moduleIdentifier) throws Module
Node<Import> root = new Node<Import>();
for (Import i : imports) {
if (i.getOptional()) {
String path = i.getName().toString();
String path = CeylonToJava.toString(i.getName());
Node<Import> current = root;
String[] tokens = path.split("\\.");
for (String token : tokens) {
Expand Down Expand Up @@ -275,7 +275,7 @@ DependencySpec createModuleDependency(Import i) {
* @return module identifer
*/
static ModuleIdentifier createModuleIdentifier(Import i) {
return ModuleIdentifier.create(i.getName().toString(), i.getVersion().toString());
return ModuleIdentifier.create(CeylonToJava.toString(i.getName()), CeylonToJava.toString(i.getVersion()));
}

public String toString() {
Expand Down
4 changes: 2 additions & 2 deletions testsuite/src/test/java/net/something/xyz/module.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ public static ceylon.language.descriptor.Module getModule() {
Import im1 = new Import(
JavaToCeylon.toQuoted("org.jboss.acme"),
JavaToCeylon.toQuoted(new ModuleVersion(1, 0, 0, "CR1").toString()),
false,
true,
true);
Import im2 = new Import(
JavaToCeylon.toQuoted("si.alesj.ceylon"),
JavaToCeylon.toQuoted(new ModuleVersion(1, 0, 0, "GA").toString()),
false,
true,
true);
return new ceylon.language.descriptor.Module(name, version, null, null, null, JavaToCeylon.toIterable(im1, im2));
}
Expand Down

0 comments on commit c70a555

Please sign in to comment.