remove tests

Author: JasonAHeron

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java

@@ -589,43 +589,17 @@ public void onUnsupportedCampaign_doesNotNotify() {
   }
 
   @Test
-  public void whenImpressed_filtersCampaign()
+  public void whenImpressedButReceivedFromBackend_doesNotFilterCampaign()
       throws ExecutionException, InterruptedException, TimeoutException {
-    CampaignMetadata otherMetadata =
-        new CampaignMetadata("otherCampaignId", "otherName", IS_NOT_TEST_MESSAGE);
-    BannerMessage otherMessage = createBannerMessageCustomMetadata(otherMetadata);
-    VanillaCampaignPayload otherCampaign =
-        VanillaCampaignPayload.newBuilder(vanillaCampaign.build())
-            .setCampaignId(otherMetadata.getCampaignId())
-            .setCampaignName(otherMetadata.getCampaignName())
-            .build();
-    ThickContent otherContent =
-        ThickContent.newBuilder(thickContent)
-            .setContent(BANNER_MESSAGE_PROTO)
-            .setIsTestCampaign(IS_NOT_TEST_MESSAGE)
-            .clearVanillaPayload()
-            .clearTriggeringConditions()
-            .addTriggeringConditions(
-                TriggeringCondition.newBuilder().setEvent(Event.newBuilder().setName("event2")))
-            .setVanillaPayload(otherCampaign)
-            .build();
-    FetchEligibleCampaignsResponse response =
-        FetchEligibleCampaignsResponse.newBuilder(eligibleCampaigns)
-            .addMessages(otherContent)
-            .build();
-    GoodFiamService impl = new GoodFiamService(response);
-    grpcServerRule.getServiceRegistry().addService(impl);
-
     Task<Void> logImpressionTask =
         displayCallbacksFactory
             .generateDisplayCallback(MODAL_MESSAGE_MODEL, ANALYTICS_EVENT_NAME)
             .impressionDetected();
     Tasks.await(logImpressionTask, 1000, TimeUnit.MILLISECONDS);
     analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
-    analyticsConnector.invokeListenerOnEvent("event2");
     waitUntilNotified(subscriber);
 
-    assertSubsriberExactly(otherMessage, subscriber);
+    assertSubsriberExactly(MODAL_MESSAGE_MODEL, subscriber);
   }
 
   // There is not a purely functional way to determine if our clients inject the impressed
@@ -834,23 +808,6 @@ public void logImpression_logsToEngagementMetrics() {
     assertThat(fileExists(IMPRESSIONS_STORE_FILE)).isTrue();
   }
 
-  @Test
-  public void whenlogImpressionFails_doesNotFilterCampaign()
-      throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
-    doThrow(new NullPointerException("e1")).when(application).openFileInput(IMPRESSIONS_STORE_FILE);
-
-    Task<Void> logImpressionTask =
-        displayCallbacksFactory
-            .generateDisplayCallback(MODAL_MESSAGE_MODEL, ANALYTICS_EVENT_NAME)
-            .impressionDetected();
-    await().timeout(2, SECONDS).until(logImpressionTask::isComplete);
-    assertThat(logImpressionTask.getException()).hasMessageThat().contains("e1");
-    analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
-    waitUntilNotified(subscriber);
-
-    assertSingleSuccessNotification(subscriber);
-  }
-
   @Test
   public void logImpression_whenlogEventLimitIncrementFails_doesNotRateLimit()
       throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
@@ -1015,65 +972,6 @@ public void onCorruptImpressionStore_doesNotFilter()
     assertSingleSuccessNotification(subscriber);
   }
 
-  @Test
-  public void onImpressionStoreReadFailure_doesNotFilter()
-      throws ExecutionException, InterruptedException, TimeoutException, IOException {
-    doThrow(new NullPointerException("e1")).when(application).openFileInput(IMPRESSIONS_STORE_FILE);
-
-    analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
-    waitUntilNotified(subscriber);
-
-    assertSingleSuccessNotification(subscriber);
-  }
-
-  // There is not a purely functional way to determine if our clients inject the impressed
-  // campaigns upstream since we filter impressions from the response on the client as well.
-  // We work around this by failing hard on the fake service if we do not find an empty impression
-  // list
-  @Test
-  public void whenImpressionStorageClientFails_injectsEmptyImpressionListUpstream()
-      throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
-    VanillaCampaignPayload otherCampaign =
-        VanillaCampaignPayload.newBuilder(vanillaCampaign.build())
-            .setCampaignId("otherCampaignId")
-            .setCampaignName("other_name")
-            .build();
-    ThickContent otherContent =
-        ThickContent.newBuilder(thickContent)
-            .setContent(BANNER_MESSAGE_PROTO)
-            .clearVanillaPayload()
-            .clearTriggeringConditions()
-            .addTriggeringConditions(
-                TriggeringCondition.newBuilder().setEvent(Event.newBuilder().setName("event2")))
-            .setVanillaPayload(otherCampaign)
-            .build();
-    FetchEligibleCampaignsResponse response =
-        FetchEligibleCampaignsResponse.newBuilder(eligibleCampaigns)
-            .addMessages(otherContent)
-            .build();
-
-    InAppMessagingSdkServingImplBase fakeFilteringService =
-        new InAppMessagingSdkServingImplBase() {
-          @Override
-          public void fetchEligibleCampaigns(
-              FetchEligibleCampaignsRequest request,
-              StreamObserver<FetchEligibleCampaignsResponse> responseObserver) {
-
-            // Fail if impressions list is not empty
-            assertThat(request.getAlreadySeenCampaignsList()).isEmpty();
-
-            responseObserver.onNext(response);
-            responseObserver.onCompleted();
-          }
-        };
-    grpcServerRule.getServiceRegistry().addService(fakeFilteringService);
-    doThrow(new NullPointerException("e1")).when(application).openFileInput(IMPRESSIONS_STORE_FILE);
-    analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
-    analyticsConnector.invokeListenerOnEvent("event2");
-
-    waitUntilNotified(subscriber);
-  }
-
   @Test
   public void whenAppForegroundIsRateLimited_doesNotNotify() {
     CampaignMetadata analyticsCampaignMetadata =

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImpl.java

@@ -28,7 +28,6 @@
 import io.reactivex.Maybe;
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.Disposable;
-import java.util.concurrent.TimeUnit;
 
 public class DisplayCallbacksImpl implements FirebaseInAppMessagingDisplayCallbacks {
 
@@ -232,7 +231,7 @@ private Completable logToImpressionStore() {
         impressionStorageClient
             .storeImpression(
                 CampaignImpression.newBuilder()
-                    .setImpressionTimestampMillis(clock.now() - TimeUnit.DAYS.toMillis(2))
+                    .setImpressionTimestampMillis(clock.now())
                     .setCampaignId(campaignId)
                     .build())
             .doOnError(e -> Logging.loge("Impression store write failure"))

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClient.java

@@ -23,7 +23,7 @@
 import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
-import java.util.ArrayList;
+import java.util.HashSet;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -100,18 +100,17 @@ public Single<Boolean> isImpressed(CampaignProto.ThickContent content) {
   }
 
   /** */
-  public void clearImpressions(FetchEligibleCampaignsResponse response) {
-    ArrayList<String> idsToClear = new ArrayList<>();
-
+  public Completable clearImpressions(FetchEligibleCampaignsResponse response) {
+    HashSet<String> idsToClear = new HashSet<>();
     for (CampaignProto.ThickContent content : response.getMessagesList()) {
       String id =
           content.getPayloadCase().equals(CampaignProto.ThickContent.PayloadCase.VANILLA_PAYLOAD)
               ? content.getVanillaPayload().getCampaignId()
               : content.getExperimentalPayload().getCampaignId();
       idsToClear.add(id);
     }
-    Logging.logd("Potential impression to clear: " + idsToClear.toString());
-    getAllImpressions()
+    Logging.logd("Potential impressions to clear: " + idsToClear.toString());
+    return getAllImpressions()
         .defaultIfEmpty(EMPTY_IMPRESSIONS)
         .flatMapCompletable(
             (storedImpressions) -> {
@@ -129,7 +128,6 @@ public void clearImpressions(FetchEligibleCampaignsResponse response) {
               return storageClient
                   .write(clearedImpressionList)
                   .doOnComplete(() -> initInMemCache(clearedImpressionList));
-            })
-        .blockingAwait();
+            });
   }
 }

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java

@@ -242,7 +242,8 @@ public Flowable<TriggeredInAppMessage> createFirebaseInAppMessageStream() {
                                           Locale.US,
                                           "Successfully fetched %d messages from backend",
                                           resp.getMessagesList().size())))
-                          .doOnSuccess(impressionStorageClient::clearImpressions)
+                          .doOnSuccess(
+                              resp -> impressionStorageClient.clearImpressions(resp).subscribe())
                           .doOnSuccess(analyticsEventsManager::updateContextualTriggers)
                           .doOnSuccess(testDeviceHelper::processCampaignFetch)
                           .doOnError(e -> Logging.logw("Service fetch error: " + e.getMessage()))

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java

@@ -198,6 +198,8 @@ public void setup() {
             abtIntegrationHelper);
     subscriber = streamManager.createFirebaseInAppMessageStream().test();
     when(application.getApplicationContext()).thenReturn(application);
+    when(impressionStorageClient.clearImpressions(any(FetchEligibleCampaignsResponse.class)))
+        .thenReturn(Completable.complete());
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(false));
     when(campaignCacheClient.get()).thenReturn(Maybe.empty());
     when(campaignCacheClient.put(any(FetchEligibleCampaignsResponse.class)))