Minor refactor of UserDefinedFunction constructor, accessors

RELNOTES: None
PiperOrigin-RevId: 166149340

2 files changed, 22 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
index 4111713cbd..8e453c2ad8 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
@@ -11,6 +11,7 @@ java_library(
         "//src/test/java/com/google/devtools/build/lib:__subpackages__",
     ],
     deps = [
+        "//src/main/java/com/google/devtools/build/lib:syntax",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
         "//third_party:guava",
         "//third_party:jsr305",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/TestUtils.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/TestUtils.java
index df84b38479..9b263badcb 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/TestUtils.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/TestUtils.java
@@ -14,6 +14,9 @@
 
 package com.google.devtools.build.lib.skyframe.serialization;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.devtools.build.lib.syntax.Environment.Frame;
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.CodedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,4 +42,22 @@ class TestUtils {
       throws SerializationException, IOException {
     return codec.deserialize(CodedInputStream.newInstance(bytes));
   }
+
+  /**
+   * Asserts that two {@link Frame}s have the same structure. Needed because {@link Frame} doesn't
+   * override {@link Object#equals}.
+   */
+  static void assertFramesEqual(Frame frame1, Frame frame2) {
+    assertThat(frame1.mutability().getAnnotation())
+        .isEqualTo(frame2.mutability().getAnnotation());
+    assertThat(frame1.getLabel()).isEqualTo(frame2.getLabel());
+    assertThat(frame1.getTransitiveBindings())
+        .containsExactlyEntriesIn(frame2.getTransitiveBindings()).inOrder();
+    if (frame1.getParent() == null || frame2.getParent() == null) {
+      assertThat(frame1.getParent()).isNull();
+      assertThat(frame2.getParent()).isNull();
+    } else {
+      assertFramesEqual(frame1.getParent(), frame2.getParent());
+    }
+  }
 }