Working on MethodHandle tests

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java
new file mode 100644 (file)
index 0000000..6bd0a09
--- /dev/null
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.github.dcevm.test.methods;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test for replacing method with MethodHandle pointing to it.
+ *
+ * @author Ivan Dubrov
+ */
+public class MethodHandleTest {
+
+  // Version 0
+  public static class A {
+    public int value() {
+      return 1;
+    }
+
+    public static int staticValue() {
+      return 3;
+    }
+  }
+
+  // Version 1
+  public static class A___1 {
+    public int value() {
+      return 2;
+    }
+
+    public static int staticValue() {
+      return 4;
+    }
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    __toVersion__(0);
+  }
+
+  @Test
+  public void testMethodHandleUpdated() throws Throwable {
+
+    assert __version__() == 0;
+
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodHandle handle = lookup.findVirtual(A.class, "value", MethodType.methodType(int.class));
+
+    A a = new A();
+    assertEquals(1, handle.invoke(a));
+
+    __toVersion__(1);
+
+    assertEquals(2, handle.invoke(a));
+
+    __toVersion__(0);
+    assert __version__() == 0;
+  }
+
+  @Test
+  public void testStaticMethodHandleUpdated() throws Throwable {
+
+    assert __version__() == 0;
+
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodHandle handle = lookup.findStatic(A.class, "staticValue", MethodType.methodType(int.class));
+
+    A a = new A();
+    assertEquals(3, handle.invoke());
+
+    __toVersion__(1);
+
+    assertEquals(4, handle.invoke());
+
+    __toVersion__(0);
+    assert __version__() == 0;
+  }
+
+}
\ No newline at end of file

diff --git a/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java b/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java
index 15b354a7dcf1fd1061455033cbd47664f7163120..3a0962c5f11455c522bb465d3b64535f585f28c7 100644 (file)
--- a/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java
+++ b/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java
@@ -32,9 +32,9 @@ import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
- * Tests for the class relationship A<B<C with adding / removing methods.
+ * Tests for replacing default methods with instance methods.
  *
- * @author Thomas Wuerthinger
+ * @author Ivan Dubrov
  */
 public class DefaultMethodsTest {