Defer generation overrides until necessary, don't mangle C# names

2 files changed, 9 insertions, 9 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 2003a4b..aeeac47 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
@@ -7,13 +7,13 @@ import org.zwobble.couscous.Backend;
 import org.zwobble.couscous.ast.LiteralNode;
 import org.zwobble.couscous.ast.MethodSignature;
 import org.zwobble.couscous.ast.TypeNode;
-import org.zwobble.couscous.types.ScalarType;
-import org.zwobble.couscous.types.Type;
-import org.zwobble.couscous.backends.naming.Names;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
+import org.zwobble.couscous.backends.csharp.CsharpCodeGenerator;
 import org.zwobble.couscous.backends.csharp.CsharpSerializer;
 import org.zwobble.couscous.tests.MethodRunner;
 import org.zwobble.couscous.tests.backends.Processes;
+import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Type;
 import org.zwobble.couscous.types.Types;
 import org.zwobble.couscous.util.ExtraLists;
 import org.zwobble.couscous.values.PrimitiveValue;
@@ -63,7 +63,7 @@ public class CsharpMethodRunner implements MethodRunner {
             methodName,
             eagerMap(arguments, argument -> argument.getType()),
             returnType);
-        String csharpMethodName = Names.toUniqueName(signature);
+        String csharpMethodName = CsharpCodeGenerator.NAMING.methodName(signature);
         String value = CsharpSerializer.serialize(
             staticMethodCall(
                 ScalarType.of(NAMESPACE + "." + className.getQualifiedName()),
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/InnerTypeReadingTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/InnerTypeReadingTests.java
index f3e054d..e7585ec 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/InnerTypeReadingTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/InnerTypeReadingTests.java
@@ -11,22 +11,22 @@ public class InnerTypeReadingTests {
     public void lambdaWithNoArgumentsAndExpressionBodyIsReadAsAnonymousClassCreation() {
         assertEquals(
             readTypes(generateMethodSource("void",
-                "java.util.function.Supplier<Integer> supplier = new java.util.function.Supplier<Integer>() {\n" +
-                    "    public Integer get() {\n" +
+                "java.util.function.IntSupplier supplier = new java.util.function.IntSupplier() {\n" +
+                    "    public int getAsInt() {\n" +
                     "        return 42;\n" +
                     "    }\n" +
                     "};")),
             readTypes(generateMethodSource("void",
-                "java.util.function.Supplier<Integer> supplier = () -> 42;")));
+                "java.util.function.IntSupplier supplier = () -> 42;")));
     }
 
     @Test
     public void lambdaWithNoArgumentsAndBlockBodyIsReadAsAnonymousClassCreation() {
         assertEquals(
             readTypes(generateMethodSource("void",
-                "java.util.function.Supplier<Integer> supplier = () -> 42;")),
+                "java.util.function.IntSupplier supplier = () -> 42;")),
             readTypes(generateMethodSource("void",
-                "java.util.function.Supplier<Integer> supplier = () -> { return 42; };")));
+                "java.util.function.IntSupplier supplier = () -> { return 42; };")));
     }
 
     @Test