99 } else { |
99 } else { |
100 NSK_DISPLAY1("Checking signatures for \"%s\" ...\n", |
100 NSK_DISPLAY1("Checking signatures for \"%s\" ...\n", |
101 name); |
101 name); |
102 |
102 |
103 if (strcmp(fld_sig[idx][2], sign) != 0 || |
103 if (strcmp(fld_sig[idx][2], sign) != 0 || |
104 strcmp(fld_sig[idx][3], (gen_sign==NULL)?"NULL":gen_sign) != 0) { |
104 strcmp(fld_sig[idx][3], (gen_sign == NULL) ? "NULL" : gen_sign) != 0) { |
105 NSK_COMPLAIN6( |
105 NSK_COMPLAIN6( |
106 "TEST FAILED: %s field \"%s\" has\n" |
106 "TEST FAILED: %s field \"%s\" has\n" |
107 "\tsignature: \"%s\"\n" |
107 "\tsignature: \"%s\"\n" |
108 "\tgeneric signature: \"%s\"\n\n" |
108 "\tgeneric signature: \"%s\"\n\n" |
109 "\tExpected: \"%s\"\n" |
109 "\tExpected: \"%s\"\n" |
110 "\t\t\"%s\"\n\n", |
110 "\t\t\"%s\"\n\n", |
111 (instance==0)?"instance":"static", |
111 (instance == 0) ? "instance" : "static", |
112 fld_sig[idx][0], |
112 fld_sig[idx][0], |
113 sign, (gen_sign==NULL)?"NULL":gen_sign, |
113 sign, (gen_sign == NULL) ? "NULL" : gen_sign, |
114 fld_sig[idx][2], fld_sig[idx][3]); |
114 fld_sig[idx][2], fld_sig[idx][3]); |
115 totRes = STATUS_FAILED; |
115 totRes = STATUS_FAILED; |
116 } |
116 } |
117 else |
117 else |
118 NSK_DISPLAY2("CHECK PASSED: signature: \"%s\",\n\tgeneric signature: \"%s\"\n", |
118 NSK_DISPLAY2("CHECK PASSED: signature: \"%s\",\n\tgeneric signature: \"%s\"\n", |
119 sign, (gen_sign==NULL)?"NULL":gen_sign); |
119 sign, (gen_sign == NULL) ? "NULL" : gen_sign); |
120 |
120 |
121 NSK_DISPLAY0("Deallocating name & signature arrays\n"); |
121 NSK_DISPLAY0("Deallocating name & signature arrays\n"); |
122 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) name))) |
122 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) name))) |
123 totRes = STATUS_FAILED; |
123 totRes = STATUS_FAILED; |
124 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) |
124 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) |
125 totRes = STATUS_FAILED; |
125 totRes = STATUS_FAILED; |
126 if (gen_sign!=NULL) |
126 if (gen_sign != NULL) |
127 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) |
127 if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) |
128 totRes = STATUS_FAILED; |
128 totRes = STATUS_FAILED; |
129 } |
129 } |
130 |
130 |
131 return totRes; |
131 return totRes; |
140 |
140 |
141 for (i=0; i<FLDS_NUM; i++) { |
141 for (i=0; i<FLDS_NUM; i++) { |
142 instance = strcmp(fld_sig[i][1], "instance"); |
142 instance = strcmp(fld_sig[i][1], "instance"); |
143 |
143 |
144 NSK_DISPLAY2(">>> Finding %s field: %s ...\n", |
144 NSK_DISPLAY2(">>> Finding %s field: %s ...\n", |
145 (instance==0)?"instance":"static", |
145 (instance == 0) ? "instance" : "static", |
146 fld_sig[i][0]); |
146 fld_sig[i][0]); |
147 if (instance==0) { |
147 if (instance == 0) { |
148 if (!NSK_JNI_VERIFY(jni, (testedFld = jni->GetFieldID(objCls, fld_sig[i][0], fld_sig[i][2])) != NULL)) { |
148 if (!NSK_JNI_VERIFY(jni, (testedFld = jni->GetFieldID(objCls, fld_sig[i][0], fld_sig[i][2])) != NULL)) { |
149 NSK_COMPLAIN1("TEST FAILERE: unable to get field ID for \"%s\"\n\n", |
149 NSK_COMPLAIN1("TEST FAILERE: unable to get field ID for \"%s\"\n\n", |
150 fld_sig[i][0]); |
150 fld_sig[i][0]); |
151 res = STATUS_FAILED; |
151 res = STATUS_FAILED; |
152 continue; |
152 continue; |