Add more slightly more complex test case for many redirects

Author: NotStirred

src/test/java/io/github/notstirred/dasm/test/tests/combined_field_method_redirects/CombinedFieldMethodRedirectsInput.java

@@ -1,9 +1,19 @@
 package io.github.notstirred.dasm.test.tests.combined_field_method_redirects;
 
-import io.github.notstirred.dasm.test.targets.CubePos;
+import io.github.notstirred.dasm.test.targets.Vec3i;
 
 public class CombinedFieldMethodRedirectsInput {
     void method1() {
-        CubePos.fromLong(0);
+        Vec3i pos1 = new Vec3i(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        Vec3i pos2 = new Vec3i(pos1.getX() + 1, pos1.getY() + 1, pos1.getZ() + 1);
+        System.out.println(pos2);
+    }
+
+    void method2() {
+        Vec3i pos1 = new Vec3i(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        Vec3i pos2 = new Vec3i(new Vec3i(0).getX() + 1, new Vec3i(0).getY() + 1, new Vec3i(0).getZ() + 1);
+        System.out.println(pos2);
     }
 }

src/test/java/io/github/notstirred/dasm/test/tests/combined_field_method_redirects/CombinedFieldMethodRedirectsOutput.java

@@ -1,14 +1,34 @@
 package io.github.notstirred.dasm.test.tests.combined_field_method_redirects;
 
 import io.github.notstirred.dasm.test.targets.CubePos;
-import io.github.notstirred.dasm.test.tests.add_to_sets.TestAddToSets;
+import io.github.notstirred.dasm.test.targets.Vec3i;
 
 public class CombinedFieldMethodRedirectsOutput {
     void method1() {
-        CubePos.fromLong(0);
+        Vec3i pos1 = new Vec3i(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        Vec3i pos2 = new Vec3i(pos1.getX() + 1, pos1.getY() + 1, pos1.getZ() + 1);
+        System.out.println(pos2);
+    }
+
+    void method2() {
+        Vec3i pos1 = new Vec3i(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        Vec3i pos2 = new Vec3i(new Vec3i(0).getX() + 1, new Vec3i(0).getY() + 1, new Vec3i(0).getZ() + 1);
+        System.out.println(pos2);
     }
 
     void method1out() {
-        TestAddToSets.testFoo(0);
+        CubePos pos1 = CubePos.from(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        CubePos pos2 = new CubePos(pos1.x() + 1, pos1.y() + 1, pos1.z() + 1);
+        System.out.println(pos2);
+    }
+
+    void method2out() {
+        CubePos pos1 = CubePos.from(0);
+        System.out.println(pos1.x + ", " + pos1.y + ", " + pos1.z + ", long:" + pos1.asLong());
+        CubePos pos2 = new CubePos(CubePos.from(0).x() + 1, CubePos.from(0).y() + 1, CubePos.from(0).z() + 1);
+        System.out.println(pos2);
     }
 }

src/test/java/io/github/notstirred/dasm/test/tests/combined_field_method_redirects/TestCombinedFieldMethodRedirects.java

@@ -3,20 +3,24 @@
 
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.ConstructorToFactoryRedirect;
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.MethodRedirect;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.TypeRedirect;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.RedirectSet;
+import io.github.notstirred.dasm.api.annotations.selector.ConstructorMethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.notstirred.dasm.test.targets.CubePos;
+import io.github.notstirred.dasm.test.targets.Vec3i;
 import io.github.notstirred.dasm.test.tests.BaseMethodTest;
 
 import static io.github.notstirred.dasm.test.tests.TestData.single;
 
 /**
  * A trivial test for a static {@link AddMethodToSets}
  */
-@Dasm(io.github.notstirred.dasm.test.tests.add_to_sets.TestAddToSets.Set.class)
+@Dasm(TestCombinedFieldMethodRedirects.Set.class)
 public class TestCombinedFieldMethodRedirects extends BaseMethodTest {
     public TestCombinedFieldMethodRedirects() {
         super(single(CombinedFieldMethodRedirectsInput.class, CombinedFieldMethodRedirectsOutput.class, TestCombinedFieldMethodRedirects.class));
@@ -25,13 +29,28 @@ public TestCombinedFieldMethodRedirects() {
     @TransformFromMethod(value = @MethodSig("method1()V"))
     native String method1out();
 
+    @TransformFromMethod(value = @MethodSig("method2()V"))
+    native String method2out();
+
     @RedirectSet
     public interface Set {
-        @TypeRedirect(from = @Ref(Object.class), to = @Ref(String.class))
-        abstract class A { }
+        @TypeRedirect(from = @Ref(Vec3i.class), to = @Ref(CubePos.class))
+        abstract class A {
+            @MethodRedirect(@MethodSig(name = "getX", args = { }, ret = @Ref(int.class)))
+            native int x();
+
+            @MethodRedirect(@MethodSig(name = "getY", args = { }, ret = @Ref(int.class)))
+            native int y();
+
+            @MethodRedirect(@MethodSig(name = "getZ", args = { }, ret = @Ref(int.class)))
+            native int z();
+
+            @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(long.class) }))
+            native CubePos from();
+        }
     }
 
-    @AddMethodToSets(owner = @Ref(CubePos.class), method = @MethodSig(name = "fromLong", ret = @Ref(CubePos.class), args = { @Ref(long.class) }), sets = io.github.notstirred.dasm.test.tests.add_to_sets.TestAddToSets.Set.class)
+    @AddMethodToSets(owner = @Ref(CubePos.class), method = @MethodSig(name = "fromLong", ret = @Ref(CubePos.class), args = { @Ref(long.class) }), sets = Set.class)
     public static CubePos testFoo(long l) {
         return null;
     }