address failing unit tests

Author: jsonbailey

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/BaseEventTest.java

@@ -203,12 +203,12 @@ public static Matcher<JsonTestValue> isIdentifyEvent(Event sourceEvent, LDValue
     );
   }
 
-  public static Matcher<JsonTestValue> isMigrationEvent(Event sourceEvent, LDValue context) {
+  public static Matcher<JsonTestValue> isMigrationEvent(Event sourceEvent, LDValue inlineContext) {
     // Doesn't fully test an event, but makes sure it is a specific event.
     return allOf(
         jsonProperty("kind", "migration_op"),
         jsonProperty("creationDate", (double)sourceEvent.getCreationDate()),
-        hasContextKeys(sourceEvent)
+        hasInlineContext(inlineContext)
     );
   }
 
@@ -248,28 +248,18 @@ private static Matcher<JsonTestValue> isFeatureOrDebugEvent(Event.FeatureRequest
     );
   }
 
-  public static Matcher<JsonTestValue> isCustomEvent(Event.Custom sourceEvent) {
+  public static Matcher<JsonTestValue> isCustomEvent(Event.Custom sourceEvent, LDValue inlineContext) {
     boolean hasData = sourceEvent.getData() != null && !sourceEvent.getData().isNull();
     return allOf(
         jsonProperty("kind", "custom"),
         jsonProperty("creationDate", (double)sourceEvent.getCreationDate()),
         jsonProperty("key", sourceEvent.getKey()),
-        hasContextKeys(sourceEvent),
+        hasInlineContext(inlineContext),
         jsonProperty("data", hasData ? jsonEqualsValue(sourceEvent.getData()) : jsonUndefined()),
         jsonProperty("metricValue", sourceEvent.getMetricValue() == null ? jsonUndefined() : jsonEqualsValue(sourceEvent.getMetricValue()))
     );
   }
 
-  public static Matcher<JsonTestValue> hasContextKeys(Event sourceEvent) {
-    ObjectBuilder b = LDValue.buildObject();
-    LDContext c = sourceEvent.getContext();
-    for (int i = 0; i < c.getIndividualContextCount(); i++) {
-      LDContext c1 = c.getIndividualContext(i);
-      b.put(c1.getKind().toString(), c1.getKey());
-    }
-    return jsonProperty("contextKeys", jsonEqualsValue(b.build()));
-  }
-
   public static Matcher<JsonTestValue> hasInlineContext(LDValue inlineContext) {
     return allOf(
         jsonProperty("context", jsonEqualsValue(inlineContext)),

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/DefaultEventProcessorOutputTest.java

@@ -399,7 +399,7 @@ public void customEventIsQueuedWithUser() throws Exception {
     }
 
     assertThat(es.getEventsFromLastRequest(), contains(
-        isCustomEvent(ce)
+        isCustomEvent(ce, userJson)
     ));
   }
 
@@ -419,7 +419,7 @@ public void customEventWithNullContextOrInvalidContextDoesNotCauseError() throws
     }
 
     assertThat(es.getEventsFromLastRequest(), contains(
-        isCustomEvent(event3)
+        isCustomEvent(event3, userJson)
     ));
   }
 

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/DefaultEventProcessorTest.java

@@ -44,15 +44,15 @@ public void eventsAreFlushedAutomatically() throws Exception {
       // sendEvent calls, they might be in two
       List<JsonTestValue> payload1 = es.getEventsFromLastRequest();
       if (payload1.size() == 1) {
-        assertThat(payload1, contains(isCustomEvent(event1)));
-        assertThat(es.getEventsFromLastRequest(), contains(isCustomEvent(event2)));
+        assertThat(payload1, contains(isCustomEvent(event1, userJson)));
+        assertThat(es.getEventsFromLastRequest(), contains(isCustomEvent(event2, userJson)));
       } else {
-        assertThat(payload1, contains(isCustomEvent(event1), isCustomEvent(event2)));
+        assertThat(payload1, contains(isCustomEvent(event1, userJson), isCustomEvent(event2, userJson)));
       }
 
       Event.Custom event3 = customEvent(user, "event3").build();
       ep.sendEvent(event3);
-      assertThat(es.getEventsFromLastRequest(), contains(isCustomEvent(event3)));
+      assertThat(es.getEventsFromLastRequest(), contains(isCustomEvent(event3, userJson)));
     }
 
     Event.Custom ce = customEvent(user, "eventkey").build();
@@ -62,7 +62,7 @@ public void eventsAreFlushedAutomatically() throws Exception {
     }
 
     assertThat(es.getEventsFromLastRequest(), contains(
-        isCustomEvent(ce)
+        isCustomEvent(ce, userJson)
     ));
   }
 
@@ -85,7 +85,7 @@ public void eventsAreNotFlushedWhenNotConnected() throws Exception {
       ep.setOffline(false);
 
       List<JsonTestValue> payload1 = es.getEventsFromLastRequest();
-      assertThat(payload1, contains(isCustomEvent(event1), isCustomEvent(event2)));
+      assertThat(payload1, contains(isCustomEvent(event1, userJson), isCustomEvent(event2, userJson)));
     }
   }
 

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/EventOutputTest.java

@@ -45,26 +45,6 @@ public void allAttributesAreSerialized() throws Exception {
         defaultEventsConfig());
   }
 
-  @Test
-  public void contextKeysAreSetInsteadOfContextWhenNotInlined() throws Exception {
-    testContextKeysSerialization(
-        LDContext.create("userkey"),
-        LDValue.buildObject().put("user", "userkey").build()
-        );
-
-    testContextKeysSerialization(
-        LDContext.create(ContextKind.of("kind1"), "key1"),
-        LDValue.buildObject().put("kind1", "key1").build()
-        );
-
-    testContextKeysSerialization(
-        LDContext.createMulti(
-            LDContext.create(ContextKind.of("kind1"), "key1"),
-            LDContext.create(ContextKind.of("kind2"), "key2")),
-        LDValue.buildObject().put("kind1", "key1").put("kind2", "key2").build()
-        );
-  }
-
   @Test
   public void allAttributesPrivateMakesAttributesPrivate() throws Exception {
     // We test this behavior in more detail in EventContextFormatterTest, but here we're verifying that the
@@ -709,25 +689,19 @@ private LDValue getSingleOutputEvent(EventOutputFormatter f, Event event) throws
     return parseValue(w.toString()).get(0);
   }
 
-  private void testContextKeysSerialization(LDContext context, LDValue expectedJsonValue) throws IOException {
-    EventsConfiguration config = makeEventsConfig(false, null);
-    EventOutputFormatter f = new EventOutputFormatter(config);
-
-    Event.Custom customEvent = customEvent(context, "eventkey").build();
-    LDValue outputEvent = getSingleOutputEvent(f, customEvent);
-    assertJsonEquals(expectedJsonValue, outputEvent.get("contextKeys"));
-    assertJsonEquals(LDValue.ofNull(), outputEvent.get("context"));
-  }
-
   private void testInlineContextSerialization(LDContext context, LDValue expectedJsonValue, EventsConfiguration baseConfig) throws IOException {
     EventsConfiguration config = makeEventsConfig(baseConfig.allAttributesPrivate, baseConfig.privateAttributes);
     EventOutputFormatter f = new EventOutputFormatter(config);
 
-    Event.FeatureRequest featureEvent = featureEvent(context, FLAG_KEY).build();
-    LDValue outputEvent = getSingleOutputEvent(f, featureEvent);
+    Event.Custom customEvent = customEvent(context, FLAG_KEY).build();
+    LDValue outputEvent = getSingleOutputEvent(f, customEvent);
     assertJsonEquals(LDValue.ofNull(), outputEvent.get("contextKeys"));
     assertJsonEquals(expectedJsonValue, outputEvent.get("context"));
 
+    Event.FeatureRequest featureEvent = featureEvent(context, FLAG_KEY).build();
+    outputEvent = getSingleOutputEvent(f, featureEvent);
+    assertJsonEquals(LDValue.ofNull(), outputEvent.get("contextKeys"));
+    assertJsonEquals(expectedJsonValue, outputEvent.get("context"));
 
     Event.Identify identifyEvent = identifyEvent(context);
     outputEvent = getSingleOutputEvent(f, identifyEvent);