Clean up conformance tests warnings and formatting.
PiperOrigin-RevId: 574304654
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 88cfdc2..fc80ec6 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -9,12 +9,15 @@
#include <stdarg.h>
+#include <cstddef>
+#include <cstdint>
#include <fstream>
+#include <memory>
#include <string>
#include "google/protobuf/util/field_comparator.h"
-#include "google/protobuf/util/json_util.h"
#include "google/protobuf/util/message_differencer.h"
+#include "absl/log/absl_check.h"
#include "absl/log/absl_log.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
@@ -28,15 +31,14 @@
using conformance::ConformanceRequest;
using conformance::ConformanceResponse;
using conformance::WireFormat;
-using google::protobuf::TextFormat;
using google::protobuf::util::DefaultFieldComparator;
using google::protobuf::util::MessageDifferencer;
using std::string;
namespace {
-static string ToOctString(const string& binary_string) {
- string oct_string;
+static std::string ToOctString(const std::string& binary_string) {
+ std::string oct_string;
for (size_t i = 0; i < binary_string.size(); i++) {
uint8_t c = binary_string.at(i);
uint8_t high = c / 64;
@@ -96,7 +98,7 @@
ConformanceLevel level, conformance::WireFormat input_format,
conformance::WireFormat output_format,
conformance::TestCategory test_category, const Message& prototype_message,
- const string& test_name, const string& input)
+ const std::string& test_name, const std::string& input)
: level_(level),
input_format_(input_format),
output_format_(output_format),
@@ -139,8 +141,9 @@
return std::unique_ptr<Message>(prototype_message_for_compare_->New());
}
-string ConformanceTestSuite::ConformanceRequestSetting::GetTestName() const {
- string rname;
+std::string ConformanceTestSuite::ConformanceRequestSetting::GetTestName()
+ const {
+ std::string rname;
switch (FileDescriptorLegacy(prototype_message_.GetDescriptor()->file())
.syntax()) {
case FileDescriptorLegacy::Syntax::SYNTAX_PROTO3:
@@ -158,7 +161,7 @@
OutputFormatString(output_format_));
}
-string
+std::string
ConformanceTestSuite::ConformanceRequestSetting::ConformanceLevelToString(
ConformanceLevel level) const {
switch (level) {
@@ -171,7 +174,7 @@
return "";
}
-string ConformanceTestSuite::ConformanceRequestSetting::InputFormatString(
+std::string ConformanceTestSuite::ConformanceRequestSetting::InputFormatString(
conformance::WireFormat format) const {
switch (format) {
case conformance::PROTOBUF:
@@ -186,7 +189,7 @@
return "";
}
-string ConformanceTestSuite::ConformanceRequestSetting::OutputFormatString(
+std::string ConformanceTestSuite::ConformanceRequestSetting::OutputFormatString(
conformance::WireFormat format) const {
switch (format) {
case conformance::PROTOBUF:
@@ -208,7 +211,7 @@
}
}
-const ConformanceRequest ConformanceTestSuite::TruncateRequest(
+ConformanceRequest ConformanceTestSuite::TruncateRequest(
const ConformanceRequest& request) {
ConformanceRequest debug_request(request);
switch (debug_request.payload_case()) {
@@ -231,7 +234,7 @@
return debug_request;
}
-const ConformanceResponse ConformanceTestSuite::TruncateResponse(
+ConformanceResponse ConformanceTestSuite::TruncateResponse(
const ConformanceResponse& response) {
ConformanceResponse debug_response(response);
switch (debug_response.result_case()) {
@@ -254,7 +257,7 @@
return debug_response;
}
-void ConformanceTestSuite::ReportSuccess(const string& test_name) {
+void ConformanceTestSuite::ReportSuccess(const std::string& test_name) {
if (expected_to_fail_.erase(test_name) != 0) {
absl::StrAppendFormat(
&output_,
@@ -266,7 +269,7 @@
successes_++;
}
-void ConformanceTestSuite::ReportFailure(const string& test_name,
+void ConformanceTestSuite::ReportFailure(const std::string& test_name,
ConformanceLevel level,
const ConformanceRequest& request,
const ConformanceResponse& response,
@@ -286,7 +289,7 @@
TruncateResponse(response).ShortDebugString());
}
-void ConformanceTestSuite::ReportSkip(const string& test_name,
+void ConformanceTestSuite::ReportSkip(const std::string& test_name,
const ConformanceRequest& request,
const ConformanceResponse& response) {
if (verbose_) {
@@ -299,19 +302,20 @@
void ConformanceTestSuite::RunValidInputTest(
const ConformanceRequestSetting& setting,
- const string& equivalent_text_format) {
+ const std::string& equivalent_text_format) {
std::unique_ptr<Message> reference_message(setting.NewTestMessage());
ABSL_CHECK(TextFormat::ParseFromString(equivalent_text_format,
reference_message.get()))
<< "Failed to parse data for test case: " << setting.GetTestName()
<< ", data: " << equivalent_text_format;
- const string equivalent_wire_format = reference_message->SerializeAsString();
+ const std::string equivalent_wire_format =
+ reference_message->SerializeAsString();
RunValidBinaryInputTest(setting, equivalent_wire_format);
}
void ConformanceTestSuite::RunValidBinaryInputTest(
const ConformanceRequestSetting& setting,
- const string& equivalent_wire_format, bool require_same_wire_format) {
+ const std::string& equivalent_wire_format, bool require_same_wire_format) {
const ConformanceRequest& request = setting.GetRequest();
ConformanceResponse response;
RunTest(setting.GetTestName(), request, &response);
@@ -321,11 +325,12 @@
void ConformanceTestSuite::VerifyResponse(
const ConformanceRequestSetting& setting,
- const string& equivalent_wire_format, const ConformanceResponse& response,
- bool need_report_success, bool require_same_wire_format) {
+ const std::string& equivalent_wire_format,
+ const ConformanceResponse& response, bool need_report_success,
+ bool require_same_wire_format) {
std::unique_ptr<Message> test_message(setting.NewTestMessage());
const ConformanceRequest& request = setting.GetRequest();
- const string& test_name = setting.GetTestName();
+ const std::string& test_name = setting.GetTestName();
ConformanceLevel level = setting.GetLevel();
std::unique_ptr<Message> reference_message = setting.NewTestMessage();
@@ -358,7 +363,7 @@
DefaultFieldComparator field_comparator;
field_comparator.set_treat_nan_as_equal(true);
differencer.set_field_comparator(&field_comparator);
- string differences;
+ std::string differences;
differencer.ReportDifferencesToString(&differences);
bool check = false;
@@ -366,7 +371,7 @@
if (require_same_wire_format) {
ABSL_DCHECK_EQ(response.result_case(),
ConformanceResponse::kProtobufPayload);
- const string& protobuf_payload = response.protobuf_payload();
+ const std::string& protobuf_payload = response.protobuf_payload();
check = equivalent_wire_format == protobuf_payload;
differences = absl::StrCat("Expect: ", ToOctString(equivalent_wire_format),
", but got: ", ToOctString(protobuf_payload));
@@ -386,15 +391,15 @@
}
}
-void ConformanceTestSuite::RunTest(const string& test_name,
+void ConformanceTestSuite::RunTest(const std::string& test_name,
const ConformanceRequest& request,
ConformanceResponse* response) {
if (test_names_.insert(test_name).second == false) {
ABSL_LOG(FATAL) << "Duplicated test name: " << test_name;
}
- string serialized_request;
- string serialized_response;
+ std::string serialized_request;
+ std::string serialized_response;
request.SerializeToString(&serialized_request);
runner_->RunTest(test_name, serialized_request, &serialized_response);
@@ -412,7 +417,7 @@
}
}
-string ConformanceTestSuite::WireFormatToString(WireFormat wire_format) {
+std::string ConformanceTestSuite::WireFormatToString(WireFormat wire_format) {
switch (wire_format) {
case conformance::PROTOBUF:
return "PROTOBUF";
@@ -435,7 +440,8 @@
}
bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
- std::string* output, const string& filename,
+ std::string* output,
+ const std::string& filename,
conformance::FailureSet* failure_list) {
runner_ = runner;
successes_ = 0;
@@ -449,7 +455,7 @@
failure_list_filename_ = filename;
expected_to_fail_.clear();
- for (const string& failure : failure_list->failure()) {
+ for (const std::string& failure : failure_list->failure()) {
AddExpectedFailedTest(failure);
}
RunSuiteImpl();
