[groovy] branch master updated: too soon

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 75d8945  too soon
75d8945 is described below

commit 75d8945b7cce90723b04b3fb0eb8c947c7416d38
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Wed Dec 22 11:32:21 2021 -0600

    too soon
---
 src/test-resources/groovy/bugs/groovy9866/C.groovy | 34 ----------------------
 .../groovy/bugs/groovy9866/Main.groovy             | 15 ++++++++++
 src/test/groovy/script/RuntimeResolveTests.groovy  |  5 ++--
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/test-resources/groovy/bugs/groovy9866/C.groovy b/src/test-resources/groovy/bugs/groovy9866/C.groovy
deleted file mode 100644
index cb4efed..0000000
--- a/src/test-resources/groovy/bugs/groovy9866/C.groovy
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package groovy.bugs.groovy9866
-
-class C implements I {
-    @Override
-    String getName() {
-    }
-    @Override
-    boolean isLoggable(Level level) { // System.Logger.Level
-    }
-    @Override
-    void log(Level level, ResourceBundle bundle, String msg, Throwable throwable) {
-    }
-    @Override
-    void log(Level level, ResourceBundle bundle, String format, Object... params) {
-    }
-}
diff --git a/src/test-resources/groovy/bugs/groovy9866/Main.groovy b/src/test-resources/groovy/bugs/groovy9866/Main.groovy
index 667d592..267afbe 100644
--- a/src/test-resources/groovy/bugs/groovy9866/Main.groovy
+++ b/src/test-resources/groovy/bugs/groovy9866/Main.groovy
@@ -18,4 +18,19 @@
  */
 package groovy.bugs.groovy9866
 
+class C implements I {
+    @Override
+    String getName() {
+    }
+    @Override
+    boolean isLoggable(Level level) { // System.Logger.Level
+    }
+    @Override
+    void log(Level level, ResourceBundle bundle, String msg, Throwable throwable) {
+    }
+    @Override
+    void log(Level level, ResourceBundle bundle, String format, Object... params) {
+    }
+}
+
 new C()
diff --git a/src/test/groovy/script/RuntimeResolveTests.groovy b/src/test/groovy/script/RuntimeResolveTests.groovy
index c678ff2..61462bc 100644
--- a/src/test/groovy/script/RuntimeResolveTests.groovy
+++ b/src/test/groovy/script/RuntimeResolveTests.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.script
 
+import org.junit.Ignore
 import org.junit.Test
 
 import static groovy.test.GroovyAssert.isAtLeastJdk
@@ -66,9 +67,9 @@ final class RuntimeResolveTests {
         runScript('/groovy/bugs/groovy9243/Main.groovy')
     }
 
-    @Test
+    @Test @Ignore
     void testResolveOuterMemberWithoutAnImport3() {
-        assumeTrue(isAtLeastJdk('9')) // System.Logger
+        assumeTrue(isAtLeastJdk('9.0')) // System.Logger
         runScript('/groovy/bugs/groovy9866/Main.groovy')
     }