Skip to content
Permalink
Browse files
8244133: Refactor nsk/jdi tests to reduce code duplication in setting…
…Breakpoint communication

Reviewed-by: cjplummer, sspitsyn
  • Loading branch information
lmesnik committed May 4, 2020
1 parent 342edb4 commit df182ea6e05619c9d33f3d1a4f9bd7c02041bafc
Showing with 594 additions and 25,925 deletions.
  1. +2 −132 test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
  2. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
  3. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
  4. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
  5. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
  6. +3 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
  7. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
  8. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
  9. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
  10. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
  11. +3 −130 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
  12. +3 −131 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
  13. +3 −129 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
  14. +2 −143 test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
  15. +2 −136 test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
  16. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
  17. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
  18. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
  19. +4 −145 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
  20. +3 −145 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
  21. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
  22. +3 −147 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
  23. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
  24. +4 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
  25. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
  26. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
  27. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
  28. +2 −141 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
  29. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
  30. +3 −146 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
  31. +2 −142 ...hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
  32. +2 −144 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
  33. +4 −128 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
  34. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
  35. +2 −139 .../jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
  36. +2 −143 .../hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
  37. +3 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
  38. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
  39. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
  40. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
  41. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
  42. +2 −141 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
  43. +2 −140 .../vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
  44. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
  45. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
  46. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
  47. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
  48. +2 −143 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
  49. +2 −143 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
  50. +2 −143 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
  51. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
  52. +2 −151 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
  53. +3 −129 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
  54. +2 −139 ...t/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
  55. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
  56. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
  57. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
  58. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
  59. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
  60. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
  61. +2 −133 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
  62. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
  63. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
  64. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
  65. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
  66. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
  67. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
  68. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
  69. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
  70. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
  71. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
  72. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
  73. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
  74. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
  75. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
  76. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
  77. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
  78. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
  79. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
  80. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
  81. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
  82. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
  83. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
  84. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
  85. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
  86. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
  87. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
  88. +2 −141 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
  89. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
  90. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
  91. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
  92. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
  93. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
  94. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
  95. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
  96. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
  97. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
  98. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
  99. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
  100. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
  101. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
  102. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
  103. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
  104. +2 −136 test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
  105. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
  106. +5 −128 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
  107. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
  108. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
  109. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
  110. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
  111. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
  112. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
  113. +4 −129 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
  114. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
  115. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
  116. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
  117. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
  118. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
  119. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
  120. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
  121. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
  122. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
  123. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
  124. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
  125. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
  126. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
  127. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
  128. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
  129. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
  130. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
  131. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
  132. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
  133. +31 −170 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
  134. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
  135. +2 −149 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
  136. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
  137. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
  138. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
  139. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
  140. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
  141. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
  142. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
  143. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
  144. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
  145. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
  146. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
  147. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
  148. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
  149. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
  150. +2 −136 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
  151. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
  152. +2 −152 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
  153. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
  154. +2 −136 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
  155. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
  156. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
  157. +2 −141 test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
  158. +2 −145 test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
  159. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
  160. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
  161. +2 −140 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
  162. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
  163. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
  164. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
  165. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
  166. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
  167. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
  168. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
  169. +2 −137 test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
  170. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
  171. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
  172. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
  173. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
  174. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
  175. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
  176. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
  177. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
  178. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
  179. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
  180. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
  181. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
  182. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
  183. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
  184. +2 −138 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
  185. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
  186. +2 −139 test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
  187. +167 −0 test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,12 @@
package nsk.jdi.BooleanType._itself_;

import nsk.share.*;
import nsk.share.jpda.*;
import nsk.share.jdi.*;

import com.sun.jdi.*;
import com.sun.jdi.event.*;
import com.sun.jdi.request.*;

import java.util.*;
import java.io.*;

/**
@@ -73,18 +71,7 @@
* <BR>
*/

public class booleantype001 {

//----------------------------------------------------- templete section
static final int PASSED = 0;
static final int FAILED = 2;
static final int PASS_BASE = 95;

//----------------------------------------------------- templete parameters
static final String
sHeader1 = "\n==> nsk/jdi/BooleanType/_itself_/booleantype001 ",
sHeader2 = "--> debugger: ",
sHeader3 = "##> debugger: ";
public class booleantype001 extends JDIBase {

//----------------------------------------------------- main method

@@ -105,19 +92,6 @@ public static int run (String argv[], PrintStream out) {
return testExitCode;
}

//-------------------------------------------------- log procedures

private static Log logHandler;

private static void log1(String message) {
logHandler.display(sHeader1 + message);
}
private static void log2(String message) {
logHandler.display(sHeader2 + message);
}
private static void log3(String message) {
logHandler.complain(sHeader3 + message);
}

// ************************************************ test parameters

@@ -127,20 +101,7 @@ private static void log3(String message) {
//====================================================== test program
//------------------------------------------------------ common section

static Debugee debuggee;
static ArgumentHandler argsHandler;

static int waitTime;

static VirtualMachine vm = null;
static EventRequestManager eventRManager = null;
static EventQueue eventQueue = null;
static EventSet eventSet = null;
static EventIterator eventIterator = null;

static ReferenceType debuggeeClass = null;

static int testExitCode = PASSED;

//------------------------------------------------------ methods

@@ -340,95 +301,4 @@ private void testRun()
return;
}

/*
* private BreakpointRequest settingBreakpoint(ThreadReference, ReferenceType,
* String, String, String)
*
* It sets up a breakpoint at given line number within a given method in a given class
* for a given thread.
*
* Return value: BreakpointRequest object in case of success
*
* JDITestRuntimeException in case of an Exception thrown within the method
*/

private BreakpointRequest settingBreakpoint ( ThreadReference thread,
ReferenceType testedClass,
String methodName,
String bpLine,
String property)
throws JDITestRuntimeException {

log2("......setting up a breakpoint:");
log2(" thread: " + thread + "; class: " + testedClass +
"; method: " + methodName + "; line: " + bpLine);

List alllineLocations = null;
Location lineLocation = null;
BreakpointRequest breakpRequest = null;

try {
Method method = (Method) testedClass.methodsByName(methodName).get(0);

alllineLocations = method.allLineLocations();

int n =
( (IntegerValue) testedClass.getValue(testedClass.fieldByName(bpLine) ) ).value();
if (n > alllineLocations.size()) {
log3("ERROR: TEST_ERROR_IN_settingBreakpoint(): number is out of bound of method's lines");
} else {
lineLocation = (Location) alllineLocations.get(n);
try {
breakpRequest = eventRManager.createBreakpointRequest(lineLocation);
breakpRequest.putProperty("number", property);
breakpRequest.addThreadFilter(thread);
breakpRequest.setSuspendPolicy( EventRequest.SUSPEND_EVENT_THREAD);
} catch ( Exception e1 ) {
log3("ERROR: inner Exception within settingBreakpoint() : " + e1);
breakpRequest = null;
}
}
} catch ( Exception e2 ) {
log3("ERROR: ATTENTION: outer Exception within settingBreakpoint() : " + e2);
breakpRequest = null;
}

if (breakpRequest == null) {
log2(" A BREAKPOINT HAS NOT BEEN SET UP");
throw new JDITestRuntimeException("**FAILURE to set up a breakpoint**");
}

log2(" a breakpoint has been set up");
return breakpRequest;
}


private void getEventSet()
throws JDITestRuntimeException {
try {
// log2(" eventSet = eventQueue.remove(waitTime);");
eventSet = eventQueue.remove(waitTime);
if (eventSet == null) {
throw new JDITestRuntimeException("** TIMEOUT while waiting for event **");
}
// log2(" eventIterator = eventSet.eventIterator;");
eventIterator = eventSet.eventIterator();
} catch ( Exception e ) {
throw new JDITestRuntimeException("** EXCEPTION while waiting for event ** : " + e);
}
}


private void breakpointForCommunication()
throws JDITestRuntimeException {

log2("breakpointForCommunication");
getEventSet();

if (eventIterator.nextEvent() instanceof BreakpointEvent)
return;

throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
}

}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,12 @@
package nsk.jdi.BreakpointRequest.addInstanceFilter;

import nsk.share.*;
import nsk.share.jpda.*;
import nsk.share.jdi.*;

import com.sun.jdi.*;
import com.sun.jdi.event.*;
import com.sun.jdi.request.*;

import java.util.*;
import java.io.*;

/**
@@ -82,18 +80,7 @@
* <BR>
*/

public class instancefilter002 {

//----------------------------------------------------- templete section
static final int PASSED = 0;
static final int FAILED = 2;
static final int PASS_BASE = 95;

//----------------------------------------------------- templete parameters
static final String
sHeader1 = "\n==> nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002 ",
sHeader2 = "--> debugger: ",
sHeader3 = "##> debugger: ";
public class instancefilter002 extends JDIBase {

//----------------------------------------------------- main method

@@ -114,20 +101,6 @@ public static int run (String argv[], PrintStream out) {
return testExitCode;
}

//-------------------------------------------------- log procedures

private static Log logHandler;

private static void log1(String message) {
logHandler.display(sHeader1 + message);
}
private static void log2(String message) {
logHandler.display(sHeader2 + message);
}
private static void log3(String message) {
logHandler.complain(sHeader3 + message);
}

// ************************************************ test parameters

private String debuggeeName =
@@ -137,25 +110,6 @@ private static void log3(String message) {
"nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002aTestClass";

//====================================================== test program
//------------------------------------------------------ common section

static Debugee debuggee;
static ArgumentHandler argsHandler;

static int waitTime;

static VirtualMachine vm = null;
static EventRequestManager eventRManager = null;
static EventQueue eventQueue = null;
static EventSet eventSet = null;
static EventIterator eventIterator = null;

static ReferenceType debuggeeClass = null;

static int testExitCode = PASSED;


//------------------------------------------------------ methods

private int runThis (String argv[], PrintStream out) {

@@ -413,97 +367,6 @@ private void testRun()
return;
}

/*
* private BreakpointRequest settingBreakpoint(ThreadReference, ReferenceType,
* String, String, String)
*
* It sets up a breakpoint at given line number within a given method in a given class
* for a given thread.
*
* Return value: BreakpointRequest object in case of success
*
* JDITestRuntimeException in case of an Exception thrown within the method
*/

private BreakpointRequest settingBreakpoint ( ThreadReference thread,
ReferenceType testedClass,
String methodName,
String bpLine,
String property)
throws JDITestRuntimeException {

log2("......setting up a breakpoint:");
log2(" thread: " + thread + "; class: " + testedClass +
"; method: " + methodName + "; line: " + bpLine);

List alllineLocations = null;
Location lineLocation = null;
BreakpointRequest breakpRequest = null;

try {
Method method = (Method) testedClass.methodsByName(methodName).get(0);

alllineLocations = method.allLineLocations();

int n =
( (IntegerValue) testedClass.getValue(testedClass.fieldByName(bpLine) ) ).value();
if (n > alllineLocations.size()) {
log3("ERROR: TEST_ERROR_IN_settingBreakpoint(): number is out of bound of method's lines");
} else {
lineLocation = (Location) alllineLocations.get(n);
try {
breakpRequest = eventRManager.createBreakpointRequest(lineLocation);
breakpRequest.putProperty("number", property);
breakpRequest.addThreadFilter(thread);
breakpRequest.setSuspendPolicy( EventRequest.SUSPEND_EVENT_THREAD);
} catch ( Exception e1 ) {
log3("ERROR: inner Exception within settingBreakpoint() : " + e1);
breakpRequest = null;
}
}
} catch ( Exception e2 ) {
log3("ERROR: ATTENTION: outer Exception within settingBreakpoint() : " + e2);
breakpRequest = null;
}

if (breakpRequest == null) {
log2(" A BREAKPOINT HAS NOT BEEN SET UP");
throw new JDITestRuntimeException("**FAILURE to set up a breakpoint**");
}

log2(" a breakpoint has been set up");
return breakpRequest;
}


private void getEventSet()
throws JDITestRuntimeException {
try {
// log2(" eventSet = eventQueue.remove(waitTime);");
eventSet = eventQueue.remove(waitTime);
if (eventSet == null) {
throw new JDITestRuntimeException("** TIMEOUT while waiting for event **");
}
// log2(" eventIterator = eventSet.eventIterator;");
eventIterator = eventSet.eventIterator();
} catch ( Exception e ) {
throw new JDITestRuntimeException("** EXCEPTION while waiting for event ** : " + e);
}
}


private void breakpointForCommunication()
throws JDITestRuntimeException {

log2("breakpointForCommunication");
getEventSet();

if (eventIterator.nextEvent() instanceof BreakpointEvent)
return;

throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
}

// ============================== test's additional methods

private BreakpointRequest setting2BreakpointRequest ( ThreadReference thread,

0 comments on commit df182ea

Please sign in to comment.