Merge pull request #1073 from andrewparmet:fix-fixed32-fixed64-celvalue

PiperOrigin-RevId: 926127185

Author: copybara-github

common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

@@ -154,11 +154,13 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 
         return toRuntimeValue(result);
       case UINT32:
+      case FIXED32:
         if (!fieldDescriptor.isRepeated()) {
           return UnsignedLong.valueOf((int) result);
         }
         break;
       case UINT64:
+      case FIXED64:
         if (!fieldDescriptor.isRepeated()) {
           return UnsignedLong.fromLongBits((long) result);
         }

common/src/test/java/dev/cel/common/values/ProtoMessageValueTest.java

@@ -303,6 +303,29 @@ public void selectField_durationOutOfRange_success(int seconds, int nanos) {
         .isEqualTo(Duration.ofSeconds(seconds, nanos));
   }
 
+  @Test
+  public void selectField_fixed32_returnsUnsignedLong() {
+    TestAllTypes testAllTypes = TestAllTypes.newBuilder().setSingleFixed32(1).build();
+
+    ProtoMessageValue protoMessageValue =
+        ProtoMessageValue.create(
+            testAllTypes, DefaultDescriptorPool.INSTANCE, PROTO_CEL_VALUE_CONVERTER, false);
+
+    assertThat(protoMessageValue.select("single_fixed32")).isEqualTo(UnsignedLong.valueOf(1L));
+  }
+
+  @Test
+  public void selectField_fixed64_returnsUnsignedLong() {
+    TestAllTypes testAllTypes =
+        TestAllTypes.newBuilder().setSingleFixed64(UnsignedLong.MAX_VALUE.longValue()).build();
+
+    ProtoMessageValue protoMessageValue =
+        ProtoMessageValue.create(
+            testAllTypes, DefaultDescriptorPool.INSTANCE, PROTO_CEL_VALUE_CONVERTER, false);
+
+    assertThat(protoMessageValue.select("single_fixed64")).isEqualTo(UnsignedLong.MAX_VALUE);
+  }
+
   @SuppressWarnings("ImmutableEnumChecker") // Test only
   private enum SelectFieldJsonValueTestCase {
     NULL(Value.newBuilder().build(), NullValue.NULL_VALUE),