< prev index next >
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp
Print this page
rev 52050 : [mq]: refactor
@@ -55,23 +55,19 @@
jmethodID setRedefinitionFailed;
testClass = jni->FindClass(MAIN_CLASS);
if (!NSK_JNI_VERIFY(jni, (
- setRedefinitionFailed = NSK_CPP_STUB4(GetStaticMethodID, jni,
- testClass, "setRedefinitionFailed", "()V")) != NULL))
+ setRedefinitionFailed = jni->GetStaticMethodID(testClass, "setRedefinitionFailed", "()V")) != NULL))
{
- NSK_CPP_STUB2(FatalError, jni,
- "TEST FAILED: while getting setRedefinitionFailed()\n");
+ jni->FatalError("TEST FAILED: while getting setRedefinitionFailed()\n");
}
if (!NSK_JNI_VERIFY(jni, (
- setRedefinitionDone = NSK_CPP_STUB4(GetStaticMethodID, jni,
- testClass, "setRedefinitionDone", "()V")) != NULL))
+ setRedefinitionDone = jni->GetStaticMethodID(testClass, "setRedefinitionDone", "()V")) != NULL))
{
- NSK_CPP_STUB2(FatalError, jni,
- "TEST FAILED: while getting setRedefinitionDone()\n");
+ jni->FatalError("TEST FAILED: while getting setRedefinitionDone()\n");
}
nsk_printf("doRedefineInNativeThread\n");
cla = jni->FindClass(SEARCH_NAME);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
@@ -80,24 +76,20 @@
if ( nsk_jvmti_redefineClass(jvmti, cla,fileName) == NSK_TRUE) {
nsk_printf("\nMyClass :: Successfully redefined..\n");
} else {
nsk_printf("\nMyClass :: Failed to redefine ..\n");
- if (!NSK_JNI_VERIFY_VOID(jni, NSK_CPP_STUB3(CallStaticVoidMethod, jni,
- testClass, setRedefinitionFailed)))
+ if (!NSK_JNI_VERIFY_VOID(jni, jni->CallStaticVoidMethod(testClass, setRedefinitionFailed)))
{
- NSK_CPP_STUB2(FatalError, jni,
- "TEST FAILED: while calling setRedefinitionFailed()\n");
+ jni->FatalError("TEST FAILED: while calling setRedefinitionFailed()\n");
}
}
}
- if (!NSK_JNI_VERIFY_VOID(jni, NSK_CPP_STUB3(CallStaticVoidMethod, jni,
- testClass, setRedefinitionDone)))
+ if (!NSK_JNI_VERIFY_VOID(jni, jni->CallStaticVoidMethod(testClass, setRedefinitionDone)))
{
- NSK_CPP_STUB2(FatalError, jni,
- "TEST FAILED: while calling setRedefinitionDone()\n");
+ jni->FatalError("TEST FAILED: while calling setRedefinitionDone()\n");
}
nsk_printf(" All 30 redefinitions are done..\n");
}
@@ -148,14 +140,12 @@
nsk_printf("hs103t002_startAgentThread\n");
name = jni->NewStringUTF(threadName);
clas = jni->FindClass("java/lang/Thread");
- if (!NSK_JNI_VERIFY(jni, (method = NSK_CPP_STUB4(GetMethodID,
- jni, clas, "<init>","(Ljava/lang/String;)V")) != NULL)) {
- NSK_CPP_STUB2(FatalError, jni,
- "failed to get ID for the java method\n");
+ if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(clas, "<init>", "(Ljava/lang/String;)V")) != NULL)) {
+ jni->FatalError("failed to get ID for the java method\n");
}
thread = (jthread) jni->NewObject(clas,method,name);
testAgentThread = jni->NewGlobalRef(thread);
err = JVMTI_ERROR_NONE;
< prev index next >