Skip to content

Commit b5a7cf7

Browse files
committed
Remove RecursiveGroup test case which doesn't exist in 25.x pre-Editions
1 parent f000b7e commit b5a7cf7

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

java/lite/src/test/java/com/google/protobuf/LiteTest.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite;
1818
import com.google.protobuf.UnittestLite.ForeignEnumLite;
1919
import com.google.protobuf.UnittestLite.ForeignMessageLite;
20-
import com.google.protobuf.UnittestLite.RecursiveGroup;
2120
import com.google.protobuf.UnittestLite.RecursiveMessage;
2221
import com.google.protobuf.UnittestLite.TestAllExtensionsLite;
2322
import com.google.protobuf.UnittestLite.TestAllTypesLite;
@@ -2614,17 +2613,6 @@ public void testParseFromBytes_recursiveMessages() throws Exception {
26142613
assertThat(thrown).hasMessageThat().contains("Protocol message had too many levels of nesting");
26152614
}
26162615

2617-
@Test
2618-
public void testParseFromBytes_recursiveKnownGroups() throws Exception {
2619-
byte[] data99 = makeRecursiveGroup(99).toByteArray();
2620-
byte[] data100 = makeRecursiveGroup(100).toByteArray();
2621-
2622-
RecursiveGroup unused = RecursiveGroup.parseFrom(data99);
2623-
Throwable thrown =
2624-
assertThrows(InvalidProtocolBufferException.class, () -> RecursiveGroup.parseFrom(data100));
2625-
assertThat(thrown).hasMessageThat().contains("Protocol message had too many levels of nesting");
2626-
}
2627-
26282616
@Test
26292617
@SuppressWarnings("ProtoParseFromByteString")
26302618
public void testMaliciousSGroupTagsWithMapField_fromByteArray() throws Exception {
@@ -3043,12 +3031,4 @@ private static RecursiveMessage makeRecursiveMessage(int num) {
30433031
return RecursiveMessage.newBuilder().setRecurse(makeRecursiveMessage(num - 1)).build();
30443032
}
30453033
}
3046-
3047-
private static RecursiveGroup makeRecursiveGroup(int num) {
3048-
if (num == 0) {
3049-
return RecursiveGroup.getDefaultInstance();
3050-
} else {
3051-
return RecursiveGroup.newBuilder().setRecurse(makeRecursiveGroup(num - 1)).build();
3052-
}
3053-
}
30543034
}

src/google/protobuf/unittest_lite.proto

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,3 @@ message RecursiveMessage {
506506
optional RecursiveMessage recurse = 1;
507507
optional bytes payload = 2;
508508
}
509-
510-
message RecursiveGroup {
511-
optional RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];
512-
}

0 commit comments

Comments
 (0)