Better debugging for resolution issues (#12)

Author: LunNova

src/main/java/org/minimallycorrect/javatransformer/internal/ClassPaths.java

@@ -45,7 +45,7 @@
 
 @UtilityClass
 public class ClassPaths {
-	public static ClassPath of(ClassPath systemClassPath, Path[] paths) {
+	public static ClassPath of(ClassPath systemClassPath, Path... paths) {
 		return new FileClassPath(systemClassPath, new ArrayList<>(Arrays.asList(paths)));
 	}
 
@@ -237,6 +237,15 @@ else if (Files.isRegularFile(path))
 				}
 		}
 
+		@Override
+		public String toString() {
+			return "FileClassPath{" +
+				"entries.size()=" + entries.size() +
+				", paths=" + paths +
+				", initialised=" + initialised +
+				", parent=" + parent +
+				'}';
+		}
 	}
 
 	/*

src/main/java/org/minimallycorrect/javatransformer/internal/ResolutionContext.java

@@ -190,6 +190,7 @@ public Type resolve(@NonNull String name) {
 			throw new TransformationException("Couldn't resolve name: " + name +
 				"\nFound real type: " + type +
 				"\nGeneric types: " + genericTypes +
+				"\nPackage: " + packageName +
 				"\nImports:" + imports.stream().map(ResolutionContext::toString).collect(Collectors.toList()) +
 				"\nClassPath: " + classPath);
 

src/test/java/org/minimallycorrect/javatransformer/api/JavaTransformerTest.java

@@ -40,7 +40,7 @@ public JavaTransformerTest(List<Path> inputs) {
 
 	@Parameterized.Parameters
 	public static Collection<List<Path>> paths() {
-		return Arrays.asList(getClassPath(), getSourcePath());
+		return Arrays.asList(getClassPath(), getSourcePath(), getMixPath());
 	}
 
 	private static List<Path> getClassPath() {
@@ -51,6 +51,10 @@ private static List<Path> getSourcePath() {
 		return new ArrayList<>(Arrays.asList(Paths.get("src/test/java/"), Paths.get("src/main/java")));
 	}
 
+	private static List<Path> getMixPath() {
+		return new ArrayList<>(Arrays.asList(Paths.get("src/test/java/"), JavaTransformer.pathFromClass((JavaTransformer.class))));
+	}
+
 	private static boolean exists(Path p) {
 		Path base = p.getParent();
 		String fileName = p.getFileName().toString();
@@ -94,6 +98,7 @@ public void testTransform() throws Exception {
 			c.getConstructors().collect(Collectors.toList());
 			c.getMethods().forEach(it -> {
 				val rt = it.getReturnType();
+				Assert.assertNotNull(it + " should have a return type", rt);
 
 				val cf = it.getCodeFragment();
 

src/test/java/org/minimallycorrect/javatransformer/transform/InnerClassReferencer.java

@@ -2,6 +2,8 @@
 
 import java.lang.invoke.MethodHandles;
 
+import org.minimallycorrect.javatransformer.api.code.CodeFragment;
+
 public class InnerClassReferencer {
 	public InnerClassExample.Inner test1() {
 		throw new UnsupportedOperationException();
@@ -12,11 +14,11 @@ public org.minimallycorrect.javatransformer.transform.InnerClassExample.Inner2 t
 	}
 
 	public AnnotationInnerClassExample.TestEnum test3() {
-		throw new UnsupportedOperationException();
+		return AnnotationInnerClassExample.TestEnum.ONE;
 	}
 
 	public org.minimallycorrect.javatransformer.transform.AnnotationInnerClassExample.TestEnum test4() {
-		throw new UnsupportedOperationException();
+		return org.minimallycorrect.javatransformer.transform.AnnotationInnerClassExample.TestEnum.TWO;
 	}
 
 	public MethodHandles.Lookup test5() {
@@ -26,4 +28,12 @@ public MethodHandles.Lookup test5() {
 	public java.lang.invoke.MethodHandles.Lookup test6() {
 		throw new UnsupportedOperationException();
 	}
+
+	public CodeFragment.InsertionOptions test7() {
+		return org.minimallycorrect.javatransformer.api.code.CodeFragment.InsertionOptions.DEFAULT;
+	}
+
+	public org.minimallycorrect.javatransformer.api.code.CodeFragment.InsertionOptions test8() {
+		return CodeFragment.InsertionOptions.DEFAULT;
+	}
 }