RxJavaPlugin Unit Tests

Attempt to fix non-determinism #329
Made unit tests work on private instances in each test rather than against static global.

Author: benjchristensen

rxjava-core/src/main/java/rx/plugins/RxJavaPlugins.java

@@ -153,33 +153,27 @@ private static Object getPluginImplementationViaProperty(Class<?> pluginClass) {
 
     public static class UnitTest {
 
-        @After
-        @Before
-        public void reset() {
-            // use private access to reset so we can test different initializations via the public static flow
-            RxJavaPlugins.getInstance().errorHandler.set(null);
-            RxJavaPlugins.getInstance().observableExecutionHook.set(null);
-        }
-
         @Test
         public void testErrorHandlerDefaultImpl() {
-            RxJavaErrorHandler impl = RxJavaPlugins.getInstance().getErrorHandler();
+            RxJavaErrorHandler impl = new RxJavaPlugins().getErrorHandler();
             assertTrue(impl instanceof RxJavaErrorHandlerDefault);
         }
 
         @Test
         public void testErrorHandlerViaRegisterMethod() {
-            RxJavaPlugins.getInstance().registerErrorHandler(new RxJavaErrorHandlerTestImpl());
-            RxJavaErrorHandler impl = RxJavaPlugins.getInstance().getErrorHandler();
+            RxJavaPlugins p = new RxJavaPlugins();
+            p.registerErrorHandler(new RxJavaErrorHandlerTestImpl());
+            RxJavaErrorHandler impl = p.getErrorHandler();
             assertTrue(impl instanceof RxJavaErrorHandlerTestImpl);
         }
 
         @Test
         public void testErrorHandlerViaProperty() {
             try {
+                RxJavaPlugins p = new RxJavaPlugins();
                 String fullClass = getFullClassNameForTestClass(RxJavaErrorHandlerTestImpl.class);
                 System.setProperty("rxjava.plugin.RxJavaErrorHandler.implementation", fullClass);
-                RxJavaErrorHandler impl = RxJavaPlugins.getInstance().getErrorHandler();
+                RxJavaErrorHandler impl = p.getErrorHandler();
                 assertTrue(impl instanceof RxJavaErrorHandlerTestImpl);
             } finally {
                 System.clearProperty("rxjava.plugin.RxJavaErrorHandler.implementation");
@@ -193,23 +187,26 @@ public static class RxJavaErrorHandlerTestImpl extends RxJavaErrorHandler {
 
         @Test
         public void testObservableExecutionHookDefaultImpl() {
-            RxJavaObservableExecutionHook impl = RxJavaPlugins.getInstance().getObservableExecutionHook();
+            RxJavaPlugins p = new RxJavaPlugins();
+            RxJavaObservableExecutionHook impl = p.getObservableExecutionHook();
             assertTrue(impl instanceof RxJavaObservableExecutionHookDefault);
         }
 
         @Test
         public void testObservableExecutionHookViaRegisterMethod() {
-            RxJavaPlugins.getInstance().registerObservableExecutionHook(new RxJavaObservableExecutionHookTestImpl());
-            RxJavaObservableExecutionHook impl = RxJavaPlugins.getInstance().getObservableExecutionHook();
+            RxJavaPlugins p = new RxJavaPlugins();
+            p.registerObservableExecutionHook(new RxJavaObservableExecutionHookTestImpl());
+            RxJavaObservableExecutionHook impl = p.getObservableExecutionHook();
             assertTrue(impl instanceof RxJavaObservableExecutionHookTestImpl);
         }
 
         @Test
         public void testObservableExecutionHookViaProperty() {
             try {
+                RxJavaPlugins p = new RxJavaPlugins();
                 String fullClass = getFullClassNameForTestClass(RxJavaObservableExecutionHookTestImpl.class);
                 System.setProperty("rxjava.plugin.RxJavaObservableExecutionHook.implementation", fullClass);
-                RxJavaObservableExecutionHook impl = RxJavaPlugins.getInstance().getObservableExecutionHook();
+                RxJavaObservableExecutionHook impl = p.getObservableExecutionHook();
                 assertTrue(impl instanceof RxJavaObservableExecutionHookTestImpl);
             } finally {
                 System.clearProperty("rxjava.plugin.RxJavaErrorHandler.implementation");