[groovy] 02/03: GROOVY-9093: fix existing tests (port to 2_5_X)

[paulk]

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

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

commit c8560a7dee07ceef5c43ecb23fc2e73dbe9b0227
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Nov 21 15:11:46 2020 +1000

    GROOVY-9093: fix existing tests (port to 2_5_X)
---
 .../packageScope/DifferentPackageTest.groovy       | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git 
a/src/test/org/codehaus/groovy/transform/packageScope/DifferentPackageTest.groovy
 
b/src/test/org/codehaus/groovy/transform/packageScope/DifferentPackageTest.groovy
index 408955c..4030f62 100644
--- 
a/src/test/org/codehaus/groovy/transform/packageScope/DifferentPackageTest.groovy
+++ 
b/src/test/org/codehaus/groovy/transform/packageScope/DifferentPackageTest.groovy
@@ -18,7 +18,6 @@
  */
 package org.codehaus.groovy.transform.packageScope
 
-import groovy.transform.NotYetImplemented
 import org.codehaus.groovy.control.*
 import org.codehaus.groovy.tools.GroovyClass
 import org.junit.Test
@@ -187,48 +186,46 @@ final class DifferentPackageTest {
         assert loader.loadClass('p.Peer').half() == 21
     }
 
-    @Test @NotYetImplemented // GROOVY-9093
+    @Test
+    // GROOVY-9093
     void testDifferentPackageShouldNotSeeInstanceProps() {
         def err = shouldFail CompilationFailedException, {
-            def loader = addSources(
-                One: P_DOT_ONE,
-                Two: '''
-                    package q
-
-                    @groovy.transform.CompileStatic
-                    class Two extends p.One {
-                        int valueSize() {
-                            value.size() // not visible
+            addSources(
+                    One: P_DOT_ONE,
+                    Two: '''
+                        package q
+
+                        @groovy.transform.CompileStatic
+                        class Two extends p.One {
+                            int valueSize() {
+                                value.size() // not visible
+                            }
                         }
-                    }
-                ''')
-            // TODO: Don't need this once compiler errors
-            assert loader.loadClass('q.Two').newInstance().valueSize() == 5
+                    ''')
         }
 
-        assert err =~ / Access to ... value is forbidden /
+        assert err.message =~ /Access to q.Two#value is forbidden/
     }
 
-    @Test @NotYetImplemented // GROOVY-9093
+    @Test
+    // GROOVY-9093
     void testDifferentPackageShouldNotSeeStaticProps1() {
         def err = shouldFail CompilationFailedException, {
-            def loader = addSources(
-                One: P_DOT_ONE,
-                Two: '''
-                    package q
-
-                    @groovy.transform.CompileStatic
-                    class Two extends p.One {
-                        static def half() {
-                            (CONST / 2) // not visible
+            addSources(
+                    One: P_DOT_ONE,
+                    Two: '''
+                        package q
+
+                        @groovy.transform.CompileStatic
+                        class Two extends p.One {
+                            static def half() {
+                                (CONST / 2) // not visible
+                            }
                         }
-                    }
-                ''')
-            // TODO: Don't need this once compiler errors
-            assert loader.loadClass('q.Two').half() == 21
+                    ''')
         }
 
-        assert err =~ / Access to p.One#CONST is forbidden /
+        assert err.message =~ /Access to q.Two#CONST is forbidden/
     }
 
     @Test
@@ -250,6 +247,6 @@ final class DifferentPackageTest {
                 ''')
         }
 
-        assert err =~ / Access to p.One#CONST is forbidden /
+        assert err.message =~ /Access to p.One#CONST is forbidden/
     }
 }