skip get original return value

Author: SylvainJuge

testing-common/integration-tests/src/main/java/context/ContextTestInstrumentation.java

@@ -68,6 +68,13 @@ public static int methodExit(@Advice.This KeyClass thiz) {
 
   @SuppressWarnings("unused")
   public static class GetApiUsageAdvice {
+
+    @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
+    public static boolean methodEnter() {
+      // always skip original method body
+      return true;
+    }
+
     @AssignReturned.ToReturned
     @Advice.OnMethodExit
     public static int methodExit(@Advice.This KeyClass thiz) {

testing-common/integration-tests/src/test/java/context/FieldBackedImplementationTest.java

@@ -140,7 +140,7 @@ void instanceState(Class<KeyClass> keyClass) throws Exception {
     KeyClass instance2 = keyClass.getConstructor().newInstance();
 
     // correct api usage stores state in map
-    instance1.incrementContextCount();
+    assertThat(instance1.incrementContextCount()).isEqualTo(1);
 
     assertThat(instance1.incrementContextCount()).isEqualTo(2);
     assertThat(instance2.incrementContextCount()).isEqualTo(1);
@@ -159,7 +159,10 @@ void modifyInstanceState(Class<KeyClass> keyClass) throws Exception {
   @MethodSource("provideKeyClassParameters")
   void removeInstanceState(Class<KeyClass> keyClass) throws Exception {
     KeyClass instance1 = keyClass.getConstructor().newInstance();
+
     instance1.putContextCount(10);
+    assertThat(instance1.getContextCount()).isEqualTo(10);
+
     instance1.removeContextCount();
 
     assertThat(instance1.getContextCount()).isEqualTo(0);