Refactor testing logic for only running under certain JDK versions

We had several tests designed to only run if the JDK version was at
least some specified version. This commit refactors that common logic
into DirectTest.

1 files changed, 4 insertions, 7 deletions

diff --git a/test/files/run/classfile-format-52.scala b/test/files/run/classfile-format-52.scala
index f0ad7c2ed6..7afa09ae0b 100644
--- a/test/files/run/classfile-format-52.scala
+++ b/test/files/run/classfile-format-52.scala
@@ -61,17 +61,14 @@ class Driver extends HasDefaultMethod {
     System.setErr(System.out)
     try {
       // this test is only valid under JDK 1.8+
-      // cheat a little by using 'ScalaVersion' because it can parse java versions just as well
-      val requiredJavaVersion = ScalaVersion("1.8")
-      val executingJavaVersion = ScalaVersion(System.getProperty("java.specification.version"))
-      if (executingJavaVersion >= requiredJavaVersion) {
+      testUnderJavaAtLeast("1.8") {
         generateInterface()
         compile()
         Class.forName("Driver").newInstance()
-      } else {
-        // under other versions just dump the expected results
+        ()   
+      } otherwise {
         println("hello from publicMethod")
-        println("hello from staticMethod")
+        println("hello from staticMethod")        
       }
     } 
     finally