< prev index next >
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp
Print this page
rev 52050 : [mq]: refactor
@@ -51,26 +51,22 @@
jfieldID fid = NULL;
NSK_DISPLAY0("Obtain tested object from a static field of debugee class\n");
NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
- if (!NSK_JNI_VERIFY(jni, (cls =
- NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(CLASS_NAME)) != NULL))
return NSK_FALSE;
NSK_DISPLAY2("Find field: %s:%s\n", FIELD_NAME, FIELD_SIGNATURE);
if (!NSK_JNI_VERIFY(jni, (fid =
- NSK_CPP_STUB4(GetStaticFieldID, jni, cls,
- FIELD_NAME, FIELD_SIGNATURE)) != NULL))
+ jni->GetStaticFieldID(cls, FIELD_NAME, FIELD_SIGNATURE)) != NULL))
return NSK_FALSE;
- if (!NSK_JNI_VERIFY(jni, (testedObject =
- NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fid)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (testedObject = jni->GetStaticObjectField(cls, fid)) != NULL))
return NSK_FALSE;
- if (!NSK_JNI_VERIFY(jni, (testedObject =
- NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (testedObject = jni->NewGlobalRef(testedObject)) != NULL))
return NSK_FALSE;
return NSK_TRUE;
}
@@ -89,11 +85,11 @@
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY0("Testcase #1: check that testedObject is not tagged\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("tag = %s\n", jlong_to_string(tag, buffer));
if (tag != 0) {
@@ -105,32 +101,31 @@
return;
if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
return;
NSK_DISPLAY0("Testcase #2: check that testedObject is not tagged\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("tag = %s\n", jlong_to_string(tag, buffer));
if (tag != 0) {
NSK_COMPLAIN1("testedObject is unexpectedly tagged: %s\n",
jlong_to_string(tag, buffer));
nsk_jvmti_setFailStatus();
}
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testedObject,
- SAMPLE_TAG))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedObject, SAMPLE_TAG))) {
nsk_jvmti_setFailStatus();
return;
}
if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
return;
if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
return;
NSK_DISPLAY0("Testcase #3: check that testedObject is tagged correctly\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("tag = %s\n", jlong_to_string(tag, buffer));
if (tag != SAMPLE_TAG) {
@@ -147,11 +142,11 @@
return;
if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
return;
NSK_DISPLAY0("Testcase #4: check that testedObject is tagged correctly\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("tag = %s\n", jlong_to_string(tag, buffer));
if (tag != SAMPLE_TAG) {
@@ -162,31 +157,31 @@
jlong_to_string(SAMPLE_TAG, buffer));
NSK_COMPLAIN1(" got=%s\n", jlong_to_string(tag, buffer));
}
nsk_jvmti_setFailStatus();
}
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testedObject, (jlong)0))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedObject, (jlong)0))) {
nsk_jvmti_setFailStatus();
return;
}
if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
return;
if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
return;
NSK_DISPLAY0("Testcase #5: check that testedObject is not tagged\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("tag = %s\n", jlong_to_string(tag, buffer));
if (tag != 0) {
NSK_COMPLAIN1("testedObject is unexpectedly tagged: %s\n",
jlong_to_string(tag, buffer));
nsk_jvmti_setFailStatus();
}
- NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject));
+ NSK_TRACE(jni->DeleteGlobalRef(testedObject));
if (!nsk_jvmti_resumeSync())
return;
}
@@ -220,11 +215,11 @@
nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
return JNI_ERR;
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)))
return JNI_ERR;
< prev index next >