Update tests to check for context instead of contextKeys

Co-Authored-By: jbailey@launchdarkly.com <accounts@sidewaysgravity.com>

Author: devin-ai-integration[bot]

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

@@ -208,7 +208,7 @@ public static Matcher<JsonTestValue> isMigrationEvent(Event sourceEvent, LDValue
     return allOf(
         jsonProperty("kind", "migration_op"),
         jsonProperty("creationDate", (double)sourceEvent.getCreationDate()),
-        hasContextKeys(sourceEvent)
+        hasContext(sourceEvent)
     );
   }
 
@@ -254,20 +254,28 @@ public static Matcher<JsonTestValue> isCustomEvent(Event.Custom sourceEvent) {
         jsonProperty("kind", "custom"),
         jsonProperty("creationDate", (double)sourceEvent.getCreationDate()),
         jsonProperty("key", sourceEvent.getKey()),
-        hasContextKeys(sourceEvent),
+        hasContext(sourceEvent),
         jsonProperty("data", hasData ? jsonEqualsValue(sourceEvent.getData()) : jsonUndefined()),
         jsonProperty("metricValue", sourceEvent.getMetricValue() == null ? jsonUndefined() : jsonEqualsValue(sourceEvent.getMetricValue()))
     );
   }
 
-  public static Matcher<JsonTestValue> hasContextKeys(Event sourceEvent) {
+  public static Matcher<JsonTestValue> hasContext(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());
+      b.put("kind", c1.getKind().toString());
+      b.put("key", c1.getKey());
+      if (c1.getName() != null) {
+        b.put("name", c1.getName());
+      }
     }
-    return jsonProperty("contextKeys", jsonEqualsValue(b.build()));
+    return jsonProperty("context", jsonEqualsValue(b.build()));
+  }
+  
+  public static Matcher<JsonTestValue> hasContextKeys(Event sourceEvent) {
+    return hasContext(sourceEvent);
   }
 
   public static Matcher<JsonTestValue> hasInlineContext(LDValue inlineContext) {

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

@@ -46,22 +46,26 @@ public void allAttributesAreSerialized() throws Exception {
   }
 
   @Test
-  public void contextKeysAreSetInsteadOfContextWhenNotInlined() throws Exception {
-    testContextKeysSerialization(
+  public void contextIsAlwaysInlined() throws Exception {
+    testContextSerialization(
         LDContext.create("userkey"),
-        LDValue.buildObject().put("user", "userkey").build()
+        LDValue.buildObject().put("kind", "user").put("key", "userkey").build()
         );
 
-    testContextKeysSerialization(
+    testContextSerialization(
         LDContext.create(ContextKind.of("kind1"), "key1"),
-        LDValue.buildObject().put("kind1", "key1").build()
+        LDValue.buildObject().put("kind", "kind1").put("key", "key1").build()
         );
 
-    testContextKeysSerialization(
+    testContextSerialization(
         LDContext.createMulti(
             LDContext.create(ContextKind.of("kind1"), "key1"),
             LDContext.create(ContextKind.of("kind2"), "key2")),
-        LDValue.buildObject().put("kind1", "key1").put("kind2", "key2").build()
+        LDValue.buildObject()
+            .put("kind", "multi")
+            .put("kind1", LDValue.buildObject().put("key", "key1").build())
+            .put("kind2", LDValue.buildObject().put("key", "key2").build())
+            .build()
         );
   }
 
@@ -709,14 +713,14 @@ private LDValue getSingleOutputEvent(EventOutputFormatter f, Event event) throws
     return parseValue(w.toString()).get(0);
   }
 
-  private void testContextKeysSerialization(LDContext context, LDValue expectedJsonValue) throws IOException {
+  private void testContextSerialization(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"));
+    assertJsonEquals(expectedJsonValue, outputEvent.get("context"));
+    assertJsonEquals(LDValue.ofNull(), outputEvent.get("contextKeys"));
   }
 
   private void testInlineContextSerialization(LDContext context, LDValue expectedJsonValue, EventsConfiguration baseConfig) throws IOException {