Merge pull request #2 from Auto81/reflect

Reflect

Author: Auto81

src/main/java/io/appium/java_client/proxy/Helpers.java

@@ -16,10 +16,7 @@
 
 package io.appium.java_client.proxy;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import java.util.Map;
-import java.util.WeakHashMap;
 import lombok.Value;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.description.method.MethodDescription;
@@ -34,7 +31,9 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -51,18 +50,8 @@ public class Helpers {
     // the performance and to avoid extensive memory usage for our case, where
     // the amount of instrumented proxy classes we create is low in comparison to the amount
     // of proxy instances.
-    private static final Map<ProxyClassSignature, Class<?>> CACHED_PROXY_CLASSES = Collections.synchronizedMap(new WeakHashMap<>());
-
-    /**
-     * Gets CACHED_PROXY_CLASSES size.
-     * Used for cache clear up tests {@see io.appium.java_client.pagefactory_tests.widget.tests.combined.CombinedWidgetTest}.
-     *
-     * @return the cached proxy classes size
-     */
-    @VisibleForTesting
-    public static int getCachedProxyClassesSize() {
-        return CACHED_PROXY_CLASSES.size();
-    }
+    private static final Map<ProxyClassSignature, Class<?>> CACHED_PROXY_CLASSES =
+        Collections.synchronizedMap(new WeakHashMap<>());
 
     private Helpers() {
     }

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java

@@ -6,15 +6,16 @@
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
 import io.appium.java_client.pagefactory_tests.widget.tests.DefaultStubWidget;
 import io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget;
-import io.appium.java_client.proxy.Helpers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
@@ -178,8 +179,19 @@ private void assertProxyClassCacheGrowth() {
         int thresholdSize = 50;
         assertThat(
             "Proxy Class Cache threshold is " + thresholdSize,
-            Helpers.getCachedProxyClassesSize(),
+            getCachedProxyClassesSize(),
             lessThan(thresholdSize)
         );
     }
+
+    private int getCachedProxyClassesSize() {
+        try {
+            Field cpc = Class.forName("io.appium.java_client.proxy.Helpers").getDeclaredField("CACHED_PROXY_CLASSES");
+            cpc.setAccessible(true);
+            Map<?, ?> cachedProxyClasses = (Map<?, ?>) cpc.get(null);
+            return cachedProxyClasses.size();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }