RFR: 8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi

[Igor Ignatyev]

On Wed, 30 Sep 2020 01:06:50 GMT, Serguei Spitsyn <sspitsyn at openjdk.org> wrote:

>>> Looks good. In the future I would like to see something like this broken up so as to not mix the smaller changes in
>>> with the massive repetitive changes.
>> 
>> thanks, Chris. unfortunately, most of the changes here weren't self-sufficient or meaningful on their own, so they
>> couldn't be (easily?) broken up. you could have though reviewed the patch as if it were broken up by reviewing each
>> particular commit separately.
>
> Igor,
> Not sure, I understand some of the fixes.
> For example:
> 
> diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
> b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java index
> 9b4967020b1..b75a9749208 100644
> --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
> +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java
> @@ -39,7 +39,7 @@
>   *                 - add to request filter for single thread
>   *                 - add to request filter for the same thread 2 times, expect behavior such as in previous case
>   *                 - add to request filter for 2 different threads, so events shouldn't be received
> - *         Test executes class nsk.share.jdi.EventTestTemplates$ClassExclusionFilterTest which uses JDI events testing
> + *         Test executes class nsk.share.jdi.ClassExclusionFilterTest which uses JDI events testing
>   *         framework based on classes from package nsk.share.jdi.*.
>   *         This framework uses following scenario:
>   *                 - debugger VM forces debugge VM to create number of objects which should generate events during test
> @@ -57,17 +57,17 @@
>   *
>   * @library /vmTestbase
>   *          /test/lib
> - * @build nsk.share.jdi.EventTestTemplates
> + * @build nsk.share.jdi.ThreadFilterTest
>   *        nsk.share.jdi.JDIEventsDebuggee
>   *        nsk.share.jdi.MonitorEventsDebuggee
> - * @run main/othervm/native PropertyResolvingWrapper
> - *      nsk.share.jdi.EventTestTemplates$ThreadFilterTest
> + * @run main/othervm/native
> + *      nsk.share.jdi.ThreadFilterTest
> The EventTestTemplates$StressTestTemplate is replaced with StressTestTemplate in the comment.
> However, the @build and @run commands replaces the EventTestTemplates or EventTestTemplates$ThreadFilterTest with the
> ThreadFilterTest. Is this intentional? There are several files with such mismatches.

@sspitsyn , I just `s/nsk.share.jdi.EventTestTemplates$/nsk.share.jdi` and then replaced
`nsk.share.jdi.EventTestTemplates` in `@build` w/ appropriate form inner class of `n.s.j.EventTestTemplates`, e.g.
`ThreadFilterTest`. and the end, the tests execute the (simantically) same classes as before.

The discrepancy b/w comments and `@run` directives are pre-existing, I'll file a separate issue to clean them up.

-------------

PR: https://git.openjdk.java.net/jdk/pull/379