Merge "Remove more protoCanBeParsedFromBytes tests"
diff --git a/javatests/com/google/gerrit/entities/converter/AccountIdProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/AccountIdProtoConverterTest.java
index 0e4fbc8..12045b1 100644
--- a/javatests/com/google/gerrit/entities/converter/AccountIdProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/AccountIdProtoConverterTest.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.junit.Test;
public class AccountIdProtoConverterTest {
@@ -48,17 +47,6 @@
assertThat(convertedAccountId).isEqualTo(accountId);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Account_Id proto = Entities.Account_Id.newBuilder().setId(24).build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Account_Id> parser = accountIdProtoConverter.getParser();
- Entities.Account_Id parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/BranchNameKeyProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/BranchNameKeyProtoConverterTest.java
index 0a73db8..7073fa7 100644
--- a/javatests/com/google/gerrit/entities/converter/BranchNameKeyProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/BranchNameKeyProtoConverterTest.java
@@ -23,7 +23,6 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import java.lang.reflect.Type;
import org.junit.Test;
@@ -55,21 +54,6 @@
assertThat(convertedNameKey).isEqualTo(nameKey);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Branch_NameKey proto =
- Entities.Branch_NameKey.newBuilder()
- .setProject(Entities.Project_NameKey.newBuilder().setName("project 1"))
- .setBranch("branch 36")
- .build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Branch_NameKey> parser = branchNameKeyProtoConverter.getParser();
- Entities.Branch_NameKey parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ChangeIdProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ChangeIdProtoConverterTest.java
index 12f3f33..fe71c42 100644
--- a/javatests/com/google/gerrit/entities/converter/ChangeIdProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ChangeIdProtoConverterTest.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.Change;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.junit.Test;
public class ChangeIdProtoConverterTest {
@@ -48,17 +47,6 @@
assertThat(convertedChangeId).isEqualTo(changeId);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Change_Id proto = Entities.Change_Id.newBuilder().setId(94).build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Change_Id> parser = changeIdProtoConverter.getParser();
- Entities.Change_Id parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ChangeKeyProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ChangeKeyProtoConverterTest.java
index e9080b3..745c90c 100644
--- a/javatests/com/google/gerrit/entities/converter/ChangeKeyProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ChangeKeyProtoConverterTest.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.Change;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.junit.Test;
public class ChangeKeyProtoConverterTest {
@@ -48,17 +47,6 @@
assertThat(convertedChangeKey).isEqualTo(changeKey);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Change_Key proto = Entities.Change_Key.newBuilder().setId("change 36").build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Change_Key> parser = changeKeyProtoConverter.getParser();
- Entities.Change_Key parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ChangeMessageKeyProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ChangeMessageKeyProtoConverterTest.java
index 72ce896..98329d2 100644
--- a/javatests/com/google/gerrit/entities/converter/ChangeMessageKeyProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ChangeMessageKeyProtoConverterTest.java
@@ -23,7 +23,6 @@
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import java.lang.reflect.Type;
import org.junit.Test;
@@ -55,21 +54,6 @@
assertThat(convertedMessageKey).isEqualTo(messageKey);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.ChangeMessage_Key proto =
- Entities.ChangeMessage_Key.newBuilder()
- .setChangeId(Entities.Change_Id.newBuilder().setId(704))
- .setUuid("aabbcc")
- .build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.ChangeMessage_Key> parser = messageKeyProtoConverter.getParser();
- Entities.ChangeMessage_Key parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ChangeProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ChangeProtoConverterTest.java
index bc669cc..ae8e06d 100644
--- a/javatests/com/google/gerrit/entities/converter/ChangeProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ChangeProtoConverterTest.java
@@ -26,7 +26,6 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import java.lang.reflect.Type;
import java.sql.Timestamp;
import org.junit.Test;
@@ -277,40 +276,6 @@
assertThat(change.getLastUpdatedOn()).isEqualTo(new Timestamp(987654L));
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Change proto =
- Entities.Change.newBuilder()
- .setChangeId(Entities.Change_Id.newBuilder().setId(14))
- .setChangeKey(Entities.Change_Key.newBuilder().setId("change 1"))
- .setRowVersion(0)
- .setCreatedOn(987654L)
- .setLastUpdatedOn(1234567L)
- .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35))
- .setDest(
- Entities.Branch_NameKey.newBuilder()
- .setProject(Entities.Project_NameKey.newBuilder().setName("project 67"))
- .setBranch("branch 74"))
- .setStatus(Change.STATUS_MERGED)
- .setCurrentPatchSetId(23)
- .setSubject("subject XYZ")
- .setTopic("my topic")
- .setOriginalSubject("original subject ABC")
- .setSubmissionId("submission ID 234")
- .setAssignee(Entities.Account_Id.newBuilder().setId(100001))
- .setIsPrivate(true)
- .setWorkInProgress(true)
- .setReviewStarted(true)
- .setRevertOf(Entities.Change_Id.newBuilder().setId(180))
- .build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Change> parser = changeProtoConverter.getParser();
- Entities.Change parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void fieldsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/LabelIdProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/LabelIdProtoConverterTest.java
index 88b9fb6..6237ac0 100644
--- a/javatests/com/google/gerrit/entities/converter/LabelIdProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/LabelIdProtoConverterTest.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.junit.Test;
public class LabelIdProtoConverterTest {
@@ -48,17 +47,6 @@
assertThat(convertedLabelId).isEqualTo(labelId);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.LabelId proto = Entities.LabelId.newBuilder().setId("label-23").build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.LabelId> parser = labelIdProtoConverter.getParser();
- Entities.LabelId parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ObjectIdProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ObjectIdProtoConverterTest.java
index 8408b69..447c47f 100644
--- a/javatests/com/google/gerrit/entities/converter/ObjectIdProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ObjectIdProtoConverterTest.java
@@ -20,7 +20,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.eclipse.jgit.lib.ObjectId;
import org.junit.Test;
@@ -48,18 +47,6 @@
assertThat(convertedObjectId).isEqualTo(objectId);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.ObjectId proto =
- Entities.ObjectId.newBuilder().setName("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef").build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.ObjectId> parser = objectIdProtoConverter.getParser();
- Entities.ObjectId parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void fieldsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/PatchSetApprovalKeyProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/PatchSetApprovalKeyProtoConverterTest.java
index 11aac0d..be55561 100644
--- a/javatests/com/google/gerrit/entities/converter/PatchSetApprovalKeyProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/PatchSetApprovalKeyProtoConverterTest.java
@@ -26,7 +26,6 @@
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import java.lang.reflect.Type;
import org.junit.Test;
@@ -65,25 +64,6 @@
assertThat(convertedKey).isEqualTo(key);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.PatchSetApproval_Key proto =
- Entities.PatchSetApproval_Key.newBuilder()
- .setPatchSetId(
- Entities.PatchSet_Id.newBuilder()
- .setChangeId(Entities.Change_Id.newBuilder().setId(42))
- .setId(14))
- .setAccountId(Entities.Account_Id.newBuilder().setId(100013))
- .setLabelId(Entities.LabelId.newBuilder().setId("label-8"))
- .build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.PatchSetApproval_Key> parser = protoConverter.getParser();
- Entities.PatchSetApproval_Key parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/PatchSetIdProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/PatchSetIdProtoConverterTest.java
index 530b431..c858582 100644
--- a/javatests/com/google/gerrit/entities/converter/PatchSetIdProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/PatchSetIdProtoConverterTest.java
@@ -23,7 +23,6 @@
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import java.lang.reflect.Type;
import org.junit.Test;
@@ -55,21 +54,6 @@
assertThat(convertedPatchSetId).isEqualTo(patchSetId);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.PatchSet_Id proto =
- Entities.PatchSet_Id.newBuilder()
- .setChangeId(Entities.Change_Id.newBuilder().setId(103))
- .setId(73)
- .build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.PatchSet_Id> parser = patchSetIdProtoConverter.getParser();
- Entities.PatchSet_Id parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void methodsExistAsExpected() {
diff --git a/javatests/com/google/gerrit/entities/converter/ProjectNameKeyProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ProjectNameKeyProtoConverterTest.java
index 2f693e6..2fa89a5 100644
--- a/javatests/com/google/gerrit/entities/converter/ProjectNameKeyProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ProjectNameKeyProtoConverterTest.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
-import com.google.protobuf.Parser;
import org.junit.Test;
public class ProjectNameKeyProtoConverterTest {
@@ -50,18 +49,6 @@
assertThat(convertedNameKey).isEqualTo(nameKey);
}
- @Test
- public void protoCanBeParsedFromBytes() throws Exception {
- Entities.Project_NameKey proto =
- Entities.Project_NameKey.newBuilder().setName("project 36").build();
- byte[] bytes = proto.toByteArray();
-
- Parser<Entities.Project_NameKey> parser = projectNameKeyProtoConverter.getParser();
- Entities.Project_NameKey parsedProto = parser.parseFrom(bytes);
-
- assertThat(parsedProto).isEqualTo(proto);
- }
-
/** See {@link SerializedClassSubject} for background and what to do if this test fails. */
@Test
public void fieldsExistAsExpected() {
