Allowed package-private methods in JRE classes to be mocked again. Cl…

…oses #70.
jmockit · Sep 24, 2014 · e807d96 · e807d96
1 parent 66f5c44
commit e807d96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/main/src/mockit/internal/expectations/mocking/ExpectationsModifier.java b/main/src/mockit/internal/expectations/mocking/ExpectationsModifier.java
@@ -259,10 +259,6 @@ private boolean isMethodOrConstructorNotToBeMocked(int access, boolean visitingC
          return true;
       }
 
-      if (useMockingBridge && notPublicNorProtected) {
-         return true;
-      }
-
       return executionMode.isMethodToBeIgnored(access) || defaultFilters != null && defaultFilters.contains(name);
    }
 

diff --git a/main/test/mockit/JREMockingTest.java b/main/test/mockit/JREMockingTest.java
@@ -4,10 +4,12 @@
  */
 package mockit;
 
+import java.awt.*;
 import java.io.*;
 import java.lang.annotation.*;
 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.List;
 import java.util.logging.*;
 
 import org.junit.*;
@@ -279,6 +281,13 @@ public void dynamicMockingOfFileOutputStreamThroughMockField() throws Exception
       stream.write("Hello world".getBytes());
    }
 
+   @Test
+   public void mockPackagePrivateMethodsInJREClass(@Mocked(cascading = false) AWTEvent awtEvent)
+   {
+       Object ctx = Deencapsulation.invoke(awtEvent, "getAccessControlContext");
+       assertNull(ctx);
+   }    
+
    // Mocking of java.lang.Object methods /////////////////////////////////////////////////////////////////////////////
 
    final Object lock = new Object();