test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp

rev 52050 : [mq]: refactor

*** 47,58 ****
      return JNI_VERSION_1_8;
  }
  #endif
  jint  Agent_Initialize(JavaVM *vm, char *options, void *reserved) {
      nsk_printf("Agent:: Agent_OnLoad .\n");
!     if ( ! NSK_VERIFY ( JNI_OK == NSK_CPP_STUB3(GetEnv, vm,
!                     (void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf("Agent:: Could not load JVMTI interface.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          jvmtiEventCallbacks eventCallbacks;
--- 47,57 ----
      return JNI_VERSION_1_8;
  }
  #endif
  jint  Agent_Initialize(JavaVM *vm, char *options, void *reserved) {
      nsk_printf("Agent:: Agent_OnLoad .\n");
!     if ( ! NSK_VERIFY ( JNI_OK == vm->GetEnv((void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf("Agent:: Could not load JVMTI interface.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          jvmtiEventCallbacks eventCallbacks;
*** 60,77 ****
              nsk_printf("# error agent Failed to parse options.\n");
              return JNI_ERR;
          }
          memset(&caps, 0, sizeof(caps));
          caps.can_redefine_classes = 1;
!         if (! NSK_JVMTI_VERIFY ( NSK_CPP_STUB2(AddCapabilities, jvmti, &caps) )) {
              nsk_printf(" Agent:: Error occured while adding capabilities.\n");
              return JNI_ERR;
          }
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(SetEventCallbacks, jvmti,
!                                     &eventCallbacks, sizeof(eventCallbacks)))) {
              nsk_printf(" Agent:: Error occured while setting event call back.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
--- 59,74 ----
              nsk_printf("# error agent Failed to parse options.\n");
              return JNI_ERR;
          }
          memset(&caps, 0, sizeof(caps));
          caps.can_redefine_classes = 1;
!         if (! NSK_JVMTI_VERIFY (jvmti->AddCapabilities(&caps) )) {
              nsk_printf(" Agent:: Error occured while adding capabilities.\n");
              return JNI_ERR;
          }
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
!         if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
              nsk_printf(" Agent:: Error occured while setting event call back.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
*** 84,95 ****
      char fileName[512];
      int redefineNumber;
  
  
      redefineNumber=0;
!     //cls= NSK_CPP_STUB2(FindClass, jni, SEARCH_NAME);
!     if (! NSK_JNI_VERIFY(jni, (cls = NSK_CPP_STUB2(FindClass, jni, SEARCH_NAME)) != NULL) ) {
          nsk_printf("Agent:: (*JNI)->FindClass(jni, %s) returns `null`.\n",SEARCH_NAME);
          return NSK_FALSE;
      }
      ret = JNI_FALSE;
      nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
--- 81,92 ----
      char fileName[512];
      int redefineNumber;
  
  
      redefineNumber=0;
!     cls = jni->FindClass(SEARCH_NAME);
!     if (! NSK_JNI_VERIFY(jni, cls != NULL) ) {
          nsk_printf("Agent:: (*JNI)->FindClass(jni, %s) returns `null`.\n",SEARCH_NAME);
          return NSK_FALSE;
      }
      ret = JNI_FALSE;
      nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));