add tests

Author: davidmoten

src/test/java/rx/internal/operators/OperatorGroupByTest.java

@@ -1875,8 +1875,8 @@ public String call(Integer x) {
         assertEquals(expected, ts.getOnNextEvents());
     }
 
+    private static final Func1<Integer, Integer> EVICTING_MAP_ELEMENT_SELECTOR = UtilityFunctions.identity();
 
-    Func1<Integer, Integer> elementSelector = UtilityFunctions.identity();
     private static final Func1<Integer, Integer> EVICTING_MAP_KEY_SELECTOR = new Func1<Integer, Integer> (){
         @Override
         public Integer call(Integer t) {
@@ -1885,38 +1885,30 @@ public Integer call(Integer t) {
 
     @Test
     public void testEvictingMapFactoryIfMapPutThrowsRuntimeExceptionThenErrorEmittedByStream() {
-        Func1<Integer, Integer> elementSelector = UtilityFunctions.identity();
-        Exceptions.throwIfFatal(null);
         final RuntimeException exception = new RuntimeException("boo");
-        //normally we would use Guava CacheBuilder for instance but to save a test dependency 
-        //we make something custom
         Func1<Action1<Integer>, Map<Integer, Object>> mapFactory = createMapFactoryThatThrowsOnPut(exception);
         TestSubscriber<Object> ts = TestSubscriber.create();
         Observable
             .range(1, 100)
-            .groupBy(EVICTING_MAP_KEY_SELECTOR, elementSelector, mapFactory)
+            .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, mapFactory)
             .flatMap(UtilityFunctions.<Observable<Integer>>identity())
             .subscribe(ts);
         ts.assertError(exception);
     }
 
     @Test(expected = OnErrorNotImplementedException.class)
-    public void testEvictingMapFactoryIfMapPutThrowsOnErrorNotImplementedExceptionThenErrorEmittedByStream() {
-        
-        Exceptions.throwIfFatal(null);
+    public void testEvictingMapFactoryIfMapPutThrowsFatalErrorThenErrorThrownBySubscribe() {
         final RuntimeException exception = new OnErrorNotImplementedException("boo", new RuntimeException());
-        //normally we would use Guava CacheBuilder for instance but to save a test dependency 
-        //we make something custom
         Func1<Action1<Integer>, Map<Integer, Object>> mapFactory = createMapFactoryThatThrowsOnPut(exception);
         TestSubscriber<Object> ts = TestSubscriber.create();
         Observable
             .range(1, 100)
-            .groupBy(EVICTING_MAP_KEY_SELECTOR, elementSelector, mapFactory)
+            .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, mapFactory)
             .flatMap(UtilityFunctions.<Observable<Integer>>identity())
             .subscribe(ts);
     }
 
-    private Func1<Action1<Integer>, Map<Integer, Object>> createMapFactoryThatThrowsOnPut(
+    private static Func1<Action1<Integer>, Map<Integer, Object>> createMapFactoryThatThrowsOnPut(
             final RuntimeException exception) {
         return new Func1<Action1<Integer>, Map<Integer, Object>>() {
             @SuppressWarnings("serial")
@@ -1954,11 +1946,10 @@ public void onRemoval(RemovalNotification<Integer, Object> notification) {
                         .build().asMap();
                 }
             };
-        Func1<Integer, Integer> elementSelector = UtilityFunctions.identity();
         TestSubscriber<String> ts = TestSubscriber.create();
         Observable
             .range(1, 100)
-            .groupBy(EVICTING_MAP_KEY_SELECTOR, elementSelector, mapFactory)
+            .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, mapFactory)
             .flatMap(new Func1<GroupedObservable<Integer, Integer>, Observable<String>>() {
                 @Override
                 public Observable<String> call(final GroupedObservable<Integer, Integer> g) {
@@ -1988,6 +1979,41 @@ public String call(Integer x) {
     public void testGroupByThrowsNpeIfEvictingMapFactoryNull() {
         Observable
         .range(1, 100)
-        .groupBy(EVICTING_MAP_KEY_SELECTOR, elementSelector, null);
+        .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, null);
+    }
+    
+    @Test
+    public void testEvictingMapFactoryIfMapCreateThrowsRuntimeExceptionThenErrorEmittedByStream() {
+        final RuntimeException exception = new RuntimeException("boo");
+        Func1<Action1<Integer>, Map<Integer, Object>> mapFactory = createMapFactoryThatThrowsOnCreate(exception);
+        TestSubscriber<Object> ts = TestSubscriber.create();
+        Observable
+            .range(1, 100)
+            .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, mapFactory)
+            .flatMap(UtilityFunctions.<Observable<Integer>>identity())
+            .subscribe(ts);
+        ts.assertError(exception);
+    }
+    
+    @Test(expected=OnErrorNotImplementedException.class)
+    public void testEvictingMapFactoryIfMapCreateThrowsFatalErrorThenSubscribeThrows() {
+        final OnErrorNotImplementedException exception = new OnErrorNotImplementedException("boo", new RuntimeException());
+        Func1<Action1<Integer>, Map<Integer, Object>> mapFactory = createMapFactoryThatThrowsOnCreate(exception);
+        TestSubscriber<Object> ts = TestSubscriber.create();
+        Observable
+            .range(1, 100)
+            .groupBy(EVICTING_MAP_KEY_SELECTOR, EVICTING_MAP_ELEMENT_SELECTOR, mapFactory)
+            .flatMap(UtilityFunctions.<Observable<Integer>>identity())
+            .subscribe(ts);
+    }
+
+    private static Func1<Action1<Integer>, Map<Integer, Object>> createMapFactoryThatThrowsOnCreate(
+            final RuntimeException exception) {
+        return new Func1<Action1<Integer>, Map<Integer, Object>>() {
+
+            @Override
+            public Map<Integer, Object> call(Action1<Integer> t) {
+                throw exception;
+            }};
     }
 }