Move naming code out of Python backend

2 files changed, 8 insertions, 5 deletions

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 651e50b..d293f84 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
@@ -9,9 +9,9 @@ import org.zwobble.couscous.ast.ClassNode;
 import org.zwobble.couscous.ast.LiteralNode;
 import org.zwobble.couscous.ast.MethodSignature;
 import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.backends.Names;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
 import org.zwobble.couscous.backends.csharp.CsharpSerializer;
-import org.zwobble.couscous.backends.python.PythonCodeGenerator;
 import org.zwobble.couscous.tests.MethodRunner;
 import org.zwobble.couscous.tests.backends.Processes;
 import org.zwobble.couscous.util.ExtraLists;
@@ -61,9 +61,10 @@ public class CsharpMethodRunner implements MethodRunner {
         boolean isVoid)
         throws IOException, InterruptedException
     {
-        String csharpMethodName = PythonCodeGenerator.toName(new MethodSignature(
+        MethodSignature signature = new MethodSignature(
             methodName,
-            eagerMap(arguments, argument -> argument.getType())));
+            eagerMap(arguments, argument -> argument.getType()));
+        String csharpMethodName = Names.toUniqueName(signature);
         String value = CsharpSerializer.serialize(
             staticMethodCall(
                 TypeName.of(NAMESPACE + "." + className.getQualifiedName()),
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
index 14fcf80..e541459 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
@@ -5,6 +5,7 @@ import org.hamcrest.Matchers;
 import org.zwobble.couscous.ast.ClassNode;
 import org.zwobble.couscous.ast.MethodSignature;
 import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.backends.Names;
 import org.zwobble.couscous.backends.python.PythonBackend;
 import org.zwobble.couscous.backends.python.PythonCodeGenerator;
 import org.zwobble.couscous.backends.python.PythonSerializer;
@@ -50,9 +51,10 @@ public class PythonMethodRunner implements MethodRunner {
             throws IOException, InterruptedException {
         
         String argumentsString = Joiner.on(", ").join(arguments.stream().map(PythonCodeGenerator::generateCode).map(PythonSerializer::serialize).iterator());
-        String pythonMethodName = PythonCodeGenerator.toName(new MethodSignature(
+        MethodSignature signature = new MethodSignature(
             methodName,
-            eagerMap(arguments, argument -> argument.getType())));
+            eagerMap(arguments, argument -> argument.getType()));
+        String pythonMethodName = Names.toUniqueName(signature);
         String program = "from couscous." + className.getQualifiedName() + " import " + className.getSimpleName() + ";" +
             "value = " + className.getSimpleName() + "." + pythonMethodName + "(" + argumentsString + ");" +
             "print(type(value)); print(value)";