Extract readSource

2 files changed, 24 insertions, 5 deletions

diff --git a/src/main/java/org/zwobble/couscous/util/ExtraMaps.java b/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
index c27e77c..e5d21e9 100644
--- a/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
+++ b/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
@@ -6,6 +6,22 @@ import java.util.Map;
 import java.util.function.Function;
 
 public class ExtraMaps {
+    public static <K, V> Map<K, V> map() {
+        return ImmutableMap.of();
+    }
+
+    public static <K, V> Map<K, V> map(K key1, V value1) {
+        return ImmutableMap.of(key1, value1);
+    }
+
+    public static <K, V> Map<K, V> map(K key1, V value1, K key2, V value2) {
+        return ImmutableMap.of(key1, value1, key2, value2);
+    }
+
+    public static <K, V> Map<K, V> map(K key1, V value1, K key2, V value2, K key3, V value3) {
+        return ImmutableMap.of(key1, value1, key2, value2, key3, value3);
+    }
+
     public static <T, K, V> Map<K, V> toMap(Iterable<T> iterable, Function<T, Map.Entry<K, V>> function) {
         ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
 
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
index b40ca3f..8a4c7e6 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
@@ -828,15 +828,18 @@ public class JavaReaderTests {
 
     private List<ClassNode> readClasses(String classBody) {
         String javaClass = generateClassSource(classBody);
-        try {
+        return readSource("com/example/Example.java", javaClass);
+    }
 
+    private List<ClassNode> readSource(String path, String contents) {
+        try {
             Path directoryPath = Files.createTempDirectory(null);
-            Path sourcePath = directoryPath.resolve("com/example/Example.java");
             try {
-                Files.createDirectories(directoryPath.resolve("com/example"));
-                Files.write(sourcePath, list(javaClass));
+                Path sourcePath = directoryPath.resolve(path);
+                Files.createDirectories(sourcePath.getParent());
+                Files.write(sourcePath, list(contents));
 
-                return JavaReader.readClassFromFile(list(directoryPath), sourcePath);
+                return JavaReader.readClassFromFile(list(directoryPath), directoryPath.resolve(path));
             } finally {
                 deleteRecursively(directoryPath.toFile());
             }