aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-04-11 19:42:51 +0100
committerMichael Williamson <mike@zwobble.org>2016-04-11 19:42:51 +0100
commit8c2884245e857c10eedaf7f89ab3fdcc671c8397 (patch)
treec1777f643a48a60d33130e2846ef61b36d023f8a
parent7f6129b691251502510035ae1f573164a850ded3 (diff)
Set namespace in C# runtime files
-rw-r--r--src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java3
-rw-r--r--src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java4
-rw-r--r--src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java6
3 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
index 6e648e6..312fd0d 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
@@ -48,7 +48,8 @@ public class CsharpBackend implements Backend {
private String readRuntimeFile(String runtimeFile) {
try {
- return Resources.toString(Resources.getResource("csharp/runtime/" + runtimeFile), StandardCharsets.UTF_8);
+ return Resources.toString(Resources.getResource("csharp/runtime/" + runtimeFile), StandardCharsets.UTF_8)
+ .replace("namespace Couscous", "namespace " + namespace);
} catch (IOException exception) {
throw new RuntimeException(exception);
}
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
index 049b8d5..88c8285 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
@@ -33,7 +33,7 @@ import static org.zwobble.couscous.util.ExtraLists.list;
import static org.zwobble.couscous.values.PrimitiveValues.value;
public class CsharpMethodRunner implements MethodRunner {
- private static final String NAMESPACE = "Couscous";
+ static final String NAMESPACE = "ExampleProject.Couscous";
@Override
public PrimitiveValue runMethod(List<TypeNode> classNodes, ScalarType className, String methodName, List<PrimitiveValue> arguments, Type returnType) {
@@ -108,7 +108,7 @@ public class CsharpMethodRunner implements MethodRunner {
path -> path.toString()));
}
- private static final String NAMESPACE_PREFIX = "Couscous.";
+ private static final String NAMESPACE_PREFIX = NAMESPACE + ".";
private static PrimitiveValue readPrimitive(String output) {
String[] lines = output.split("[\\r\\n]+");
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
index a585efd..bda974e 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
@@ -1,12 +1,10 @@
package org.zwobble.couscous.tests.backends.csharp;
-import org.junit.Ignore;
-import org.junit.Test;
import org.zwobble.couscous.CouscousCompiler;
-import org.zwobble.couscous.types.ScalarType;
import org.zwobble.couscous.backends.csharp.CsharpBackend;
import org.zwobble.couscous.frontends.java.JavaFrontend;
import org.zwobble.couscous.tests.CompilerTests;
+import org.zwobble.couscous.types.ScalarType;
import org.zwobble.couscous.values.PrimitiveValue;
import java.io.IOException;
@@ -29,7 +27,7 @@ public class JavaToCsharpTests extends CompilerTests {
try {
CouscousCompiler compiler = new CouscousCompiler(
new JavaFrontend(),
- new CsharpBackend(directoryPath, "Couscous"));
+ new CsharpBackend(directoryPath, CsharpMethodRunner.NAMESPACE));
compiler.compileDirectory(list(directory), directory);
return CsharpMethodRunner.runFunction(directoryPath, type, methodName, arguments, returnType);
} finally {