Skip to content

Commit

Permalink
Get rid of some deprecated methods
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 718853470
  • Loading branch information
@blickly @copybara-github
blickly authored and copybara-github committed Jan 23, 2025
1 parent c8e826c commit be52561
Showing 1 changed file with 33 additions and 35 deletions.
68 changes: 33 additions & 35 deletions test/com/google/javascript/jscomp/serialization/ColorSerializerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void addASuperTypeRelationship() {
.addType(subTypeColor.getExpectedTypeProto())
.addDisambiguationEdges(
SubtypingEdge.newBuilder()
.setSubtype(subTypeColor.getExpectedTypePointer())
.setSupertype(superTypeColor.getExpectedTypePointer())
.setSubtype(subTypeColor.expectedTypePointer())
.setSupertype(superTypeColor.expectedTypePointer())
.build())
// empty DebugInfo
.setDebugInfo(TypePool.DebugInfo.getDefaultInstance())
Expand Down Expand Up @@ -144,8 +144,8 @@ public void implicitAdditionOfSuperType() {
.addType(superTypeColor.getExpectedTypeProto())
.addDisambiguationEdges(
SubtypingEdge.newBuilder()
.setSubtype(subTypeColor.getExpectedTypePointer())
.setSupertype(superTypeColor.getExpectedTypePointer())
.setSubtype(subTypeColor.expectedTypePointer())
.setSupertype(superTypeColor.expectedTypePointer())
.build())
// DebugInfo is present but empty.
.setDebugInfo(TypePool.DebugInfo.getDefaultInstance())
Expand Down Expand Up @@ -256,18 +256,18 @@ public void simulatedClasses() {
.addType(childClassPrototypeTestColor.getExpectedTypeProto())
.addDisambiguationEdges(
SubtypingEdge.newBuilder()
.setSubtype(childClassConstructorTestColor.getExpectedTypePointer())
.setSupertype(baseClassConstructorTestColor.getExpectedTypePointer())
.setSubtype(childClassConstructorTestColor.expectedTypePointer())
.setSupertype(baseClassConstructorTestColor.expectedTypePointer())
.build())
.addDisambiguationEdges(
SubtypingEdge.newBuilder()
.setSubtype(childClassInstanceTestColor.getExpectedTypePointer())
.setSupertype(baseClassInstanceTestColor.getExpectedTypePointer())
.setSubtype(childClassInstanceTestColor.expectedTypePointer())
.setSupertype(baseClassInstanceTestColor.expectedTypePointer())
.build())
.addDisambiguationEdges(
SubtypingEdge.newBuilder()
.setSubtype(childClassPrototypeTestColor.getExpectedTypePointer())
.setSupertype(baseClassPrototypeTestColor.getExpectedTypePointer())
.setSubtype(childClassPrototypeTestColor.expectedTypePointer())
.setSupertype(baseClassPrototypeTestColor.expectedTypePointer())
.build())
// DebugInfo is present but empty.
.setDebugInfo(TypePool.DebugInfo.getDefaultInstance())
Expand Down Expand Up @@ -392,11 +392,11 @@ public void filterPropertyNames() {
.addPooledString(droppedPropertyName)
.addColor(testColor)
.generateTypePool()
.getTypePool();
.typePool();

final List<Integer> ownPropertyList =
actualTypePool.getType(0).getObject().getOwnPropertyList();
assertThat(ownPropertyList).containsExactly(keptPropertyName.getPoolOffset());
assertThat(ownPropertyList).containsExactly(keptPropertyName.poolOffset());
}

@Test
Expand Down Expand Up @@ -565,11 +565,11 @@ TestColor build() {
.setConstructor(isConstructor)
.setClosureAssert(isClosureAssert)
.setInstanceColors(
instanceTestColors.stream().map(TestColor::getColor).collect(toImmutableSet()))
instanceTestColors.stream().map(TestColor::color).collect(toImmutableSet()))
.setPrototypes(
prototypeTestColors.stream().map(TestColor::getColor).collect(toImmutableSet()))
prototypeTestColors.stream().map(TestColor::color).collect(toImmutableSet()))
.setOwnProperties(
ownProperties.stream().map(PooledString::getValue).collect(toImmutableSet()));
ownProperties.stream().map(PooledString::value).collect(toImmutableSet()));
final Integer typePointer = TypePointers.untrimOffset(trimmedPoolOffset);
final TypeProto.Builder typeProtoBuilder = TypeProto.newBuilder();
final ObjectTypeProto.Builder objectTypeProtoBuilder = typeProtoBuilder.getObjectBuilder();
Expand All @@ -581,14 +581,14 @@ TestColor build() {
.setClosureAssert(isClosureAssert)
.addAllInstanceType(
instanceTestColors.stream()
.map(TestColor::getExpectedTypePointer)
.map(TestColor::expectedTypePointer)
.collect(Collectors.toList()))
.addAllPrototype(
prototypeTestColors.stream()
.map(TestColor::getExpectedTypePointer)
.map(TestColor::expectedTypePointer)
.collect(Collectors.toList()))
.addAllOwnProperty(
ownProperties.stream().map(PooledString::getPoolOffset).collect(Collectors.toList()));
ownProperties.stream().map(PooledString::poolOffset).collect(Collectors.toList()));
return TestColor.create(colorBuilder.build(), typeProtoBuilder.build(), typePointer);
}
}
Expand All @@ -612,14 +612,14 @@ TestUnionColorBuilder addTestColor(TestColor testColor) {
TestColor build() {
checkState(trimmedPoolOffset >= 0, "call setTrimmedPoolOffset() first");
final ImmutableSet<Color> memberColors =
memberTestColors.stream().map(TestColor::getColor).collect(toImmutableSet());
memberTestColors.stream().map(TestColor::color).collect(toImmutableSet());
Color color = Color.createUnion(memberColors);

final Integer typePointer = TypePointers.untrimOffset(trimmedPoolOffset);

final List<Integer> memberTypePoiners =
memberTestColors.stream()
.map(TestColor::getExpectedTypePointer)
.map(TestColor::expectedTypePointer)
.collect(Collectors.toList());
final TypeProto.Builder typeProtoBuilder = TypeProto.newBuilder();
typeProtoBuilder.getUnionBuilder().addAllUnionMember(memberTypePoiners);
Expand Down Expand Up @@ -669,7 +669,7 @@ public int getExpectedTypePointer() {
// The Integer we expect ColorSerializer to create for this Color.

public TypeProto getExpectedTypeProto() {
return checkNotNull(getNullableExpectedTypeProto());
return checkNotNull(nullableExpectedTypeProto());
}

static TestColor create(
Expand Down Expand Up @@ -698,16 +698,14 @@ public ImmutableList<TestColor> getTestColors() {
}

public List<Color> getColors() {
return getTestColors().stream().map(TestColor::getColor).collect(Collectors.toList());
return testColors().stream().map(TestColor::color).collect(Collectors.toList());
}

public TypePool.DebugInfo.Mismatch getExpectedMismatch() {
final List<Integer> involvedColorTypePointers =
getTestColors().stream()
.map(TestColor::getExpectedTypePointer)
.collect(Collectors.toList());
testColors().stream().map(TestColor::expectedTypePointer).collect(Collectors.toList());
return TypePool.DebugInfo.Mismatch.newBuilder()
.setSourceRef(getLocationString())
.setSourceRef(locationString())
.addAllInvolvedColor(involvedColorTypePointers)
.build();
}
Expand Down Expand Up @@ -766,9 +764,9 @@ Tester init() {

/** Be prepared to respond to a request for this string. */
Tester addPooledString(PooledString pooledString) {
final String string = pooledString.getValue();
final String string = pooledString.value();
checkState(!stringToPoolOffsetMap.containsKey(string), "duplicate string added: %s", string);
stringToPoolOffsetMap.put(string, pooledString.getPoolOffset());
stringToPoolOffsetMap.put(string, pooledString.poolOffset());
return this;
}

Expand All @@ -778,20 +776,20 @@ Tester linkSubColorToSuperColor(Color subColor, Color superColor) {
}

Tester linkSubColorToSuperColor(TestColor subColor, TestColor superColor) {
return linkSubColorToSuperColor(subColor.getColor(), superColor.getColor());
return linkSubColorToSuperColor(subColor.color(), superColor.color());
}

Tester addMismatch(TestMismatch testMismatch) {
final String locationString = testMismatch.getLocationString();
final String locationString = testMismatch.locationString();
for (Color color : testMismatch.getColors()) {
colorToMismatchLocationStringsMap.put(color, locationString);
}
return this;
}

Tester addColor(TestColor testColor) {
final Integer typePointer = colorSerializer.addColor(testColor.getColor());
assertThat(typePointer).isEqualTo(testColor.getExpectedTypePointer());
final Integer typePointer = colorSerializer.addColor(testColor.color());
assertThat(typePointer).isEqualTo(testColor.expectedTypePointer());
return this;
}

Expand All @@ -802,10 +800,10 @@ Tester addColors(TestColor... testColors) {
Tester addColors(List<TestColor> testColorList) {
checkNotNull(colorSerializer, "call init() first");
final List<Color> colors =
testColorList.stream().map(TestColor::getColor).collect(Collectors.toList());
testColorList.stream().map(TestColor::color).collect(Collectors.toList());
final ImmutableList<Integer> typePointers = colorSerializer.addColors(colors);
for (int i = 0; i < testColorList.size(); ++i) {
assertThat(typePointers.get(i)).isEqualTo(testColorList.get(i).getExpectedTypePointer());
assertThat(typePointers.get(i)).isEqualTo(testColorList.get(i).expectedTypePointer());
}
return this;
}
Expand All @@ -832,7 +830,7 @@ public TypePool getTypePool() {
}

ProtoSubject assertThatTypePool() {
return assertThat(getTypePool());
return assertThat(typePool());
}

static GenerateTypePoolTestResult create(TypePool typePool) {
Expand Down

0 comments on commit be52561

Please sign in to comment.