From 4f694565c39702c79e8c3b4baad8ab8b50417348 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel.tofvesson@gmail.com>
Date: Sat, 18 Apr 2020 21:24:47 +0200
Subject: [PATCH] Update tests to test instruction merging

---
 test/MergeInject.java | 18 ++++++++++++++----
 test/Test.java        |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/test/MergeInject.java b/test/MergeInject.java
index 3d29036..0380481 100644
--- a/test/MergeInject.java
+++ b/test/MergeInject.java
@@ -1,8 +1,9 @@
 import dev.w1zzrd.asm.InjectClass;
 import dev.w1zzrd.asm.Inject;
+import static dev.w1zzrd.asm.InPlaceInjection.*;
 
 @InjectClass(value = MergeTest.class)
-public class MergeInject implements Runnable {
+public class MergeInject extends MergeTest implements Runnable {
 
     @Inject
     public int number;
@@ -16,10 +17,17 @@ public class MergeInject implements Runnable {
         number = 10;
     }
 
-    @Inject
-    private String test(){
+    @Inject(REPLACE)
+    public String test(){
         System.out.println(s);
+
+        if(s.endsWith("e!!")) {
+            System.out.println("Special!");
+            return "ASDF";
+        }
+
         System.out.println(number);
+
         return "Modified";
     }
 
@@ -28,7 +36,9 @@ public class MergeInject implements Runnable {
     public void run() {
         for (int i = 0; i < 5; ++i) {
             s = s + "!";
-            System.out.println(test());
+            System.out.println(test()+'\n');
         }
     }
+
+    public String test1(){ return null; }
 }
diff --git a/test/Test.java b/test/Test.java
index 6f1a0a4..9c4456e 100644
--- a/test/Test.java
+++ b/test/Test.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 public class Test {
     public static void main(String... args) throws IOException {
         Merger m = new Merger("MergeTest");
-        m.inject(Merger.getClassNode("MergeInject"));
+        m.inject("MergeInject");
         m.compile();
 
         Runnable r = (Runnable)new MergeTest("Constructor message");