You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/12/18 01:15:29 UTC

[groovy] branch master updated: GROOVY-7233: Pre-factor (fix merge glitch)

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

paulk 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 cd59624  GROOVY-7233: Pre-factor (fix merge glitch)
cd59624 is described below

commit cd59624b7a04421be2f1249a0c25dbbe10b84632
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Dec 18 11:13:54 2018 +1000

    GROOVY-7233: Pre-factor (fix merge glitch)
---
 src/test/groovy/util/logging/CommonsTest.groovy | 74 -------------------------
 1 file changed, 74 deletions(-)

diff --git a/src/test/groovy/util/logging/CommonsTest.groovy b/src/test/groovy/util/logging/CommonsTest.groovy
index 9e2a460..b8d5acc 100644
--- a/src/test/groovy/util/logging/CommonsTest.groovy
+++ b/src/test/groovy/util/logging/CommonsTest.groovy
@@ -56,80 +56,6 @@ class CommonsTest extends GroovyTestCase {
         }
     }
 
-    void testExplicitPrivateFinalStaticLogFieldAppears() {
-        Class clazz = new GroovyClassLoader().parseClass('''
-            import static groovy.transform.options.Visibility.*
-            @groovy.transform.VisibilityOptions(value = PRIVATE)
-            @groovy.util.logging.Commons
-            class MyClass {
-            }
-        ''')
-
-        assert clazz.declaredFields.find { Field field ->
-            field.name == "log" &&
-                    Modifier.isPrivate(field.getModifiers()) && 
-                    Modifier.isStatic(field.getModifiers()) &&
-                    Modifier.isTransient(field.getModifiers()) &&
-                    Modifier.isFinal(field.getModifiers())
-        }
-    }
-
-    void testPackagePrivateFinalStaticLogFieldAppears() {
-        Class clazz = new GroovyClassLoader().parseClass('''
-            import static groovy.transform.options.Visibility.*
-            @groovy.transform.VisibilityOptions(value = PACKAGE_PRIVATE)
-            @groovy.util.logging.Commons
-            class MyClass {
-            }
-        ''')
-
-        assert clazz.declaredFields.find { Field field ->
-            field.name == "log" &&
-                    !Modifier.isPrivate(field.getModifiers()) && 
-                    !Modifier.isProtected(field.getModifiers()) && 
-                    !Modifier.isPublic(field.getModifiers()) && 
-                    Modifier.isStatic(field.getModifiers()) &&
-                    Modifier.isTransient(field.getModifiers()) &&
-                    Modifier.isFinal(field.getModifiers())
-        }
-    }
-
-    void testProtectedFinalStaticLogFieldAppears() {
-        Class clazz = new GroovyClassLoader().parseClass('''
-            import static groovy.transform.options.Visibility.*
-            @groovy.transform.VisibilityOptions(value = PROTECTED)
-            @groovy.util.logging.Commons
-            class MyClass {
-            }
-        ''')
-
-        assert clazz.declaredFields.find { Field field ->
-            field.name == "log" &&
-                    Modifier.isProtected(field.getModifiers()) &&
-                    Modifier.isStatic(field.getModifiers()) &&
-                    Modifier.isTransient(field.getModifiers()) &&
-                    Modifier.isFinal(field.getModifiers())
-        }
-    }
-
-    void testPublicFinalStaticLogFieldAppears() {
-        Class clazz = new GroovyClassLoader().parseClass('''
-            import static groovy.transform.options.Visibility.*
-            @groovy.transform.VisibilityOptions(value = PUBLIC)
-            @groovy.util.logging.Commons
-            class MyClass {
-            }
-        ''')
-
-        assert clazz.declaredFields.find { Field field ->
-            field.name == "log" &&
-                    Modifier.isPublic(field.getModifiers()) &&
-                    Modifier.isStatic(field.getModifiers()) &&
-                    Modifier.isTransient(field.getModifiers()) &&
-                    Modifier.isFinal(field.getModifiers())
-        }
-    }
-
     void testPrivateFinalStaticNamedLogFieldAppears() {
         Class clazz = new GroovyClassLoader().parseClass('''
               @groovy.util.logging.Commons('logger')