< prev index next >

test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp

Print this page
rev 52185 : [mq]: refactor

@@ -47,13 +47,11 @@
     jlong tag;
     jvmtiHeapCallbacks emptyHeapCallbacks;
 
     NSK_DISPLAY0("FollowReferences: Invalid class:");
 
-    retCode = NSK_CPP_STUB6(FollowReferences,
-                              jvmti,
-                              (jint) 0,                 /* heap filter */
+    retCode = jvmti->FollowReferences((jint) 0,                 /* heap filter */
                               (jclass) &g_wrongHeapCallbacks ,   /* invalid class, but valid memory address */
                               NULL,                     /* inital object */
                               &g_wrongHeapCallbacks,
                               (const void *) &g_fakeUserData);
 

@@ -73,13 +71,11 @@
     emptyHeapCallbacks.heap_iteration_callback = NULL;
     emptyHeapCallbacks.heap_reference_callback = NULL;
     emptyHeapCallbacks.primitive_field_callback = NULL;
     emptyHeapCallbacks.array_primitive_value_callback = NULL;
     emptyHeapCallbacks.string_primitive_value_callback = NULL;
-    retCode = NSK_CPP_STUB6(FollowReferences,
-                            jvmti,
-                            (jint) 0,               // heap filter
+    retCode = jvmti->FollowReferences((jint) 0,               // heap filter
                             NULL,                   // class
                             (jobject) &g_wrongHeapCallbacks,  // invalid inital object
                             &emptyHeapCallbacks,    // No callbacks
                             (const void *) &g_fakeUserData);
 

@@ -88,13 +84,11 @@
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("FollowReferences: Invalid callbacks:");
 
-    retCode = NSK_CPP_STUB6(FollowReferences,
-                              jvmti,
-                              (jint) 0,     /* heap filter */
+    retCode = jvmti->FollowReferences((jint) 0,     /* heap filter */
                               NULL,         /* class */
                               NULL,         /* inital object */
                               NULL,
                               (const void *) &g_fakeUserData);
 

@@ -102,59 +96,46 @@
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("GetTag: Invalid object:");
 
-    retCode = NSK_CPP_STUB3(GetTag,
-                              jvmti,
-                              (jobject) &g_wrongHeapCallbacks,  /* invalid inital object */
+    retCode = jvmti->GetTag((jobject) &g_wrongHeapCallbacks,  /* invalid inital object */
                               &tag);
 
     if ( ! NSK_VERIFY(retCode == JVMTI_ERROR_INVALID_OBJECT ) ) {
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("GetTag: NULL object pointer:");
 
-    retCode = NSK_CPP_STUB3(GetTag,
-                              jvmti,
-                              NULL,
-                              &tag);
+    retCode = jvmti->GetTag(NULL, &tag);
 
     if ( ! NSK_VERIFY(retCode == JVMTI_ERROR_INVALID_OBJECT ) ) {
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("GetTag: NULL tag pointer:");
 
-    retCode = NSK_CPP_STUB3(GetTag,
-                              jvmti,
-                              (jobject) &g_wrongHeapCallbacks,
-                              NULL);
+    retCode = jvmti->GetTag((jobject) &g_wrongHeapCallbacks, NULL);
 
     if ( ! NSK_VERIFY(retCode == JVMTI_ERROR_NULL_POINTER ) ) {
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("SetTag: Invalid object:");
 
     tag = 1;
-    retCode = NSK_CPP_STUB3(SetTag,
-                              jvmti,
-                              (jobject) &g_wrongHeapCallbacks,  /* invalid inital object */
+    retCode = jvmti->SetTag((jobject) &g_wrongHeapCallbacks,  /* invalid inital object */
                               tag);
 
     if ( ! NSK_VERIFY(retCode == JVMTI_ERROR_INVALID_OBJECT ) ) {
         nsk_jvmti_setFailStatus();
     }
 
     NSK_DISPLAY0("SetTag: NULL object pointer:");
 
-    retCode = NSK_CPP_STUB3(GetTag,
-                              jvmti,
-                              NULL,
-                              &tag);
+    retCode = jvmti->GetTag(NULL, &tag);
 
     if ( ! NSK_VERIFY(retCode == JVMTI_ERROR_INVALID_OBJECT ) ) {
         nsk_jvmti_setFailStatus();
     }
 

@@ -168,19 +149,16 @@
 {
     jvmtiError retCode;
     jclass klass;
 
     NSK_DISPLAY1("Verify, that no objects are returned if initial object is %s", szClassName);
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(FindClass, jni, szClassName)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->FindClass(szClassName)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
-    retCode = NSK_CPP_STUB6(FollowReferences,
-                              jvmti,
-                              (jint) 0,     /* heap filter */
+    retCode = jvmti->FollowReferences((jint) 0,     /* heap filter */
                               klass, /* class */
                               NULL,         /* inital object */
                               &g_wrongHeapCallbacks,
                               (const void *) &g_fakeUserData);
 

@@ -250,11 +228,11 @@
     {
         jvmtiCapabilities caps;
 
         memset(&caps, 0, sizeof(caps));
         caps.can_tag_objects = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
             return JNI_ERR;
         }
     }
 
     if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL))) {
< prev index next >