From c9f8abd1d61f1ccd39be799191c8bd998de7f81d Mon Sep 17 00:00:00 2001 From: Klein Hu Date: Thu, 18 Apr 2019 12:32:48 -0700 Subject: [PATCH] Refactor unit tests location and groups --- cmake/onnxruntime_unittests.cmake | 10 ++-- .../{ => unit_tests}/converter_tests.cc | 56 +++++++++---------- .../{ => unit_tests}/http_routes_tests.cc | 14 ++--- .../{ => unit_tests}/json_handling_tests.cc | 10 ++-- .../server_configuration_test.cc | 12 ++-- .../hosting/{ => unit_tests}/test_main.cc | 0 .../hosting/{ => unit_tests}/util_tests.cc | 18 +++--- 7 files changed, 60 insertions(+), 60 deletions(-) rename onnxruntime/test/hosting/{ => unit_tests}/converter_tests.cc (95%) rename onnxruntime/test/hosting/{ => unit_tests}/http_routes_tests.cc (95%) rename onnxruntime/test/hosting/{ => unit_tests}/json_handling_tests.cc (97%) rename onnxruntime/test/hosting/{ => unit_tests}/server_configuration_test.cc (92%) rename onnxruntime/test/hosting/{ => unit_tests}/test_main.cc (100%) rename onnxruntime/test/hosting/{ => unit_tests}/util_tests.cc (88%) diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake index 8c1b4b17ddeee..1f85e72fac4f1 100644 --- a/cmake/onnxruntime_unittests.cmake +++ b/cmake/onnxruntime_unittests.cmake @@ -540,14 +540,14 @@ endif() if (onnxruntime_BUILD_HOSTING) file(GLOB onnxruntime_test_hosting_src - "${TEST_SRC_DIR}/hosting/*.cc" - "${TEST_SRC_DIR}/hosting/*.h" + "${TEST_SRC_DIR}/hosting/unit_tests/*.cc" + "${TEST_SRC_DIR}/hosting/unit_tests/*.h" ) if(NOT WIN32) if(HAS_UNUSED_PARAMETER) - set_source_files_properties("${TEST_SRC_DIR}/hosting/json_handling_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) - set_source_files_properties("${TEST_SRC_DIR}/hosting/converter_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) - set_source_files_properties("${TEST_SRC_DIR}/hosting/util_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) + set_source_files_properties("${TEST_SRC_DIR}/hosting/unit_tests/json_handling_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) + set_source_files_properties("${TEST_SRC_DIR}/hosting/unit_tests/converter_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) + set_source_files_properties("${TEST_SRC_DIR}/hosting/unit_tests/util_tests.cc" PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) endif() endif() diff --git a/onnxruntime/test/hosting/converter_tests.cc b/onnxruntime/test/hosting/unit_tests/converter_tests.cc similarity index 95% rename from onnxruntime/test/hosting/converter_tests.cc rename to onnxruntime/test/hosting/unit_tests/converter_tests.cc index e4b8fb2e0910d..a470cc12e6258 100644 --- a/onnxruntime/test/hosting/converter_tests.cc +++ b/onnxruntime/test/hosting/unit_tests/converter_tests.cc @@ -22,7 +22,7 @@ IExecutionProvider* TestCPUExecutionProvider() { return &cpu_provider; } -TEST(PositiveTests, MLDataTypeToTensorProtoDataTypeTests) { +TEST(MLDataTypeToTensorProtoDataTypeTests, MLDataTypeToTensorProtoDataTypeTests) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); MLDataType ml_data_type = DataTypeImpl::GetType(); @@ -86,7 +86,7 @@ TEST(PositiveTests, MLDataTypeToTensorProtoDataTypeTests) { EXPECT_EQ(result, onnx::TensorProto_DataType_UNDEFINED); } -TEST(PositiveTests, MLValueToTensorProtoTests_FloatToRaw) { +TEST(MLValueToTensorProtoTests, FloatToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -125,7 +125,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_FloatToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_FloatToFloatData) { +TEST(MLValueToTensorProtoTests, FloatToFloatData) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -160,7 +160,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_FloatToFloatData) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int32ToRaw) { +TEST(MLValueToTensorProtoTests, Int32ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -199,7 +199,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int32ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int32ToInt32Data) { +TEST(MLValueToTensorProtoTests, Int32ToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -234,7 +234,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int32ToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt8ToRaw) { +TEST(MLValueToTensorProtoTests, UInt8ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -273,7 +273,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt8ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt8ToInt32Data) { +TEST(MLValueToTensorProtoTests, UInt8ToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -310,7 +310,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt8ToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int8ToRaw) { +TEST(MLValueToTensorProtoTests, Int8ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -349,7 +349,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int8ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int8ToInt32Data) { +TEST(MLValueToTensorProtoTests, Int8ToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -386,7 +386,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int8ToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt16ToRaw) { +TEST(MLValueToTensorProtoTests, UInt16ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 3}; @@ -425,7 +425,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt16ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt16ToInt32Data) { +TEST(MLValueToTensorProtoTests, UInt16ToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 3}; @@ -462,7 +462,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt16ToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int16ToRaw) { +TEST(MLValueToTensorProtoTests, Int16ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -501,7 +501,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int16ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int16ToInt32Data) { +TEST(MLValueToTensorProtoTests, Int16ToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -538,7 +538,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int16ToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_BoolToRaw) { +TEST(MLValueToTensorProtoTests, BoolToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -577,7 +577,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_BoolToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_BoolToInt32Data) { +TEST(MLValueToTensorProtoTests, BoolToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -614,7 +614,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_BoolToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Float16ToRaw) { +TEST(MLValueToTensorProtoTests, Float16ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -659,7 +659,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Float16ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_FloatToInt32Data) { +TEST(MLValueToTensorProtoTests, FloatToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -702,7 +702,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_FloatToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_BFloat16ToRaw) { +TEST(MLValueToTensorProtoTests, BFloat16ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -747,7 +747,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_BFloat16ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_BFloatToInt32Data) { +TEST(MLValueToTensorProtoTests, BFloatToInt32Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -790,7 +790,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_BFloatToInt32Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_StringToStringData) { +TEST(MLValueToTensorProtoTests, StringToStringData) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -832,7 +832,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_StringToStringData) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int64ToRaw) { +TEST(MLValueToTensorProtoTests, Int64ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -871,7 +871,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int64ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_Int64ToInt64Data) { +TEST(MLValueToTensorProtoTests, Int64ToInt64Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -906,7 +906,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_Int64ToInt64Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt32ToRaw) { +TEST(MLValueToTensorProtoTests, UInt32ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -945,7 +945,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt32ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt32ToUint64Data) { +TEST(MLValueToTensorProtoTests, UInt32ToUint64Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -983,7 +983,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt32ToUint64Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt64ToRaw) { +TEST(MLValueToTensorProtoTests, UInt64ToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -1022,7 +1022,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt64ToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_UInt64ToInt64Data) { +TEST(MLValueToTensorProtoTests, UInt64ToInt64Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -1057,7 +1057,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_UInt64ToInt64Data) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_DoubleToRaw) { +TEST(MLValueToTensorProtoTests, DoubleToRaw) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; @@ -1096,7 +1096,7 @@ TEST(PositiveTests, MLValueToTensorProtoTests_DoubleToRaw) { } } -TEST(PositiveTests, MLValueToTensorProtoTests_DoubleToInt64Data) { +TEST(MLValueToTensorProtoTests, DoubleToInt64Data) { auto logger = std::make_unique(::onnxruntime::test::DefaultLoggingManager().DefaultLogger()); std::vector dims_mul_x = {3, 2}; diff --git a/onnxruntime/test/hosting/http_routes_tests.cc b/onnxruntime/test/hosting/unit_tests/http_routes_tests.cc similarity index 95% rename from onnxruntime/test/hosting/http_routes_tests.cc rename to onnxruntime/test/hosting/unit_tests/http_routes_tests.cc index 9bd46c65503e8..9acc32adce9c9 100644 --- a/onnxruntime/test/hosting/http_routes_tests.cc +++ b/onnxruntime/test/hosting/unit_tests/http_routes_tests.cc @@ -19,7 +19,7 @@ void do_something(const std::string& name, const std::string& version, void run_route(const std::string& pattern, http::verb method, const std::vector& data, bool does_validate_data); -TEST(PositiveTests, RegisterTest) { +TEST(HttpRouteTests, RegisterTest) { auto predict_regex = R"(/v1/models/([^/:]+)(?:/versions/(\d+))?:(classify|regress|predict))"; Routes routes; EXPECT_TRUE(routes.RegisterController(http::verb::post, predict_regex, do_something)); @@ -28,7 +28,7 @@ TEST(PositiveTests, RegisterTest) { EXPECT_TRUE(routes.RegisterController(http::verb::get, status_regex, do_something)); } -TEST(PositiveTests, PostRouteTest) { +TEST(HttpRouteTests, PostRouteTest) { auto predict_regex = R"(/v1/models/([^/:]+)(?:/versions/(\d+))?:(classify|regress|predict))"; std::vector actions{ @@ -41,7 +41,7 @@ TEST(PositiveTests, PostRouteTest) { run_route(predict_regex, http::verb::post, actions, true); } -TEST(NegativeTests, PostRouteInvalidURLTest) { +TEST(HttpRouteTests, PostRouteInvalidURLTest) { auto predict_regex = R"(/v1/models/([^/:]+)(?:/versions/(\d+))?:(classify|regress|predict))"; std::vector actions{ @@ -65,7 +65,7 @@ TEST(NegativeTests, PostRouteInvalidURLTest) { // These tests are because we currently only support POST and GET // Some HTTP methods should be removed from test data if we support more (e.g. PUT) -TEST(NegativeTests, PostRouteInvalidMethodTest) { +TEST(HttpRouteTests, PostRouteInvalidMethodTest) { auto predict_regex = R"(/v1/models/([^/:]+)(?:/versions/(\d+))?:(classify|regress|predict))"; std::vector actions{ @@ -104,6 +104,6 @@ void run_route(const std::string& pattern, http::verb method, const std::vector< } } -} // namespace test -} // namespace hosting -} // namespace onnxruntime +} // namespace test +} // namespace hosting +} // namespace onnxruntime diff --git a/onnxruntime/test/hosting/json_handling_tests.cc b/onnxruntime/test/hosting/unit_tests/json_handling_tests.cc similarity index 97% rename from onnxruntime/test/hosting/json_handling_tests.cc rename to onnxruntime/test/hosting/unit_tests/json_handling_tests.cc index 54ed06d2d0f77..7e64d03349fde 100644 --- a/onnxruntime/test/hosting/json_handling_tests.cc +++ b/onnxruntime/test/hosting/unit_tests/json_handling_tests.cc @@ -14,7 +14,7 @@ namespace hosting { namespace test { namespace protobufutil = google::protobuf::util; -TEST(PositiveTests, JsonDeserializationHappyPath) { +TEST(JsonDeserializationTests, HappyPath) { std::string input_json = "{\"inputs\":{\"Input3\":{\"dims\":[\"1\",\"1\",\"28\",\"28\"],\"dataType\":1,\"rawData\":\"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\"}},\"outputFilter\":[\"Plus214_Output_0\"]}"; onnxruntime::hosting::PredictRequest request; protobufutil::Status status = onnxruntime::hosting::GetRequestFromJson(input_json, request); @@ -22,7 +22,7 @@ TEST(PositiveTests, JsonDeserializationHappyPath) { EXPECT_EQ(protobufutil::error::OK, status.error_code()); } -TEST(PositiveTests, JsonDeserializationWithUnknownField) { +TEST(JsonDeserializationTests, WithUnknownField) { std::string input_json = "{\"foo\": \"bar\",\"inputs\":{\"Input3\":{\"dims\":[\"1\",\"1\",\"28\",\"28\"],\"dataType\":1,\"rawData\":\"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\"}},\"outputFilter\":[\"Plus214_Output_0\"]}"; onnxruntime::hosting::PredictRequest request; protobufutil::Status status = onnxruntime::hosting::GetRequestFromJson(input_json, request); @@ -30,7 +30,7 @@ TEST(PositiveTests, JsonDeserializationWithUnknownField) { EXPECT_EQ(protobufutil::error::OK, status.error_code()); } -TEST(NegativeTests, JsonDeserialization_InvalidData) { +TEST(JsonDeserializationTests, InvalidData) { std::string input_json = "{\"inputs\":{\"Input3\":{\"dims\":[\"1\",\"1\",\"28\",\"28\"],\"dataType\":1,\"rawData\":\"hello\"}},\"outputFilter\":[\"Plus214_Output_0\"]}"; onnxruntime::hosting::PredictRequest request; protobufutil::Status status = onnxruntime::hosting::GetRequestFromJson(input_json, request); @@ -39,7 +39,7 @@ TEST(NegativeTests, JsonDeserialization_InvalidData) { EXPECT_EQ("inputs[0].value.raw_data: invalid value \"hello\" for type TYPE_BYTES", status.error_message()); } -TEST(NegativeTests, JsonDeserializationInvalidJson) { +TEST(JsonDeserializationTests, InvalidJson) { std::string input_json = "{inputs\":{\"Input3\":{\"dims\":[\"1\",\"1\",\"28\",\"28\"],\"dataType\":1,\"rawData\":\"hello\"}},\"outputFilter\":[\"Plus214_Output_0\"]}"; onnxruntime::hosting::PredictRequest request; protobufutil::Status status = onnxruntime::hosting::GetRequestFromJson(input_json, request); @@ -49,7 +49,7 @@ TEST(NegativeTests, JsonDeserializationInvalidJson) { EXPECT_EQ("Expected : between key:value pair.\n{inputs\":{\"Input3\":{\"dims\":\n ^", status.error_message()); } -TEST(PositiveTests, JsonSerializationHappyPath) { +TEST(JsonSerializationTests, HappyPath) { std::string test_data = "testdata/hosting/response_0.pb"; std::string expected_json_string = "{\"outputs\":{\"Plus214_Output_0\":{\"dims\":[\"1\",\"10\"],\"dataType\":1,\"rawData\":\"4+pzRFWuGsSMdM1F2gEnRFdRZcRZ9NDEURj0xBIzdsJOS0LEA/GzxA==\"}}}"; onnxruntime::hosting::PredictResponse response; diff --git a/onnxruntime/test/hosting/server_configuration_test.cc b/onnxruntime/test/hosting/unit_tests/server_configuration_test.cc similarity index 92% rename from onnxruntime/test/hosting/server_configuration_test.cc rename to onnxruntime/test/hosting/unit_tests/server_configuration_test.cc index 651b6e07b3193..a1c9698a8f856 100644 --- a/onnxruntime/test/hosting/server_configuration_test.cc +++ b/onnxruntime/test/hosting/unit_tests/server_configuration_test.cc @@ -10,7 +10,7 @@ namespace onnxruntime { namespace hosting { namespace test { -TEST(PositiveTests, ConfigParsingAllArgs) { +TEST(ConfigParsingTests, AllArgs) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--model_path"), const_cast("testdata/mul_1.pb"), @@ -29,7 +29,7 @@ TEST(PositiveTests, ConfigParsingAllArgs) { EXPECT_EQ(config.logging_level, onnxruntime::logging::Severity::kINFO); } -TEST(PositiveTests, ConfigParsingDefaults) { +TEST(ConfigParsingTests, Defaults) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--model"), const_cast("testdata/mul_1.pb"), @@ -45,7 +45,7 @@ TEST(PositiveTests, ConfigParsingDefaults) { EXPECT_EQ(config.logging_level, onnxruntime::logging::Severity::kVERBOSE); } -TEST(PositiveTests, ConfigParsingHelp) { +TEST(ConfigParsingTests, Help) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--help")}; @@ -55,7 +55,7 @@ TEST(PositiveTests, ConfigParsingHelp) { EXPECT_EQ(res, Result::ExitSuccess); } -TEST(NegativeTests, ConfigParsingNoModelArg) { +TEST(ConfigParsingTests, NoModelArg) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--num_http_threads"), const_cast("3")}; @@ -65,7 +65,7 @@ TEST(NegativeTests, ConfigParsingNoModelArg) { EXPECT_EQ(res, Result::ExitFailure); } -TEST(NegativeTests, ConfigParsingModelNotFound) { +TEST(ConfigParsingTests, ModelNotFound) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--model_path"), const_cast("does/not/exist"), @@ -78,7 +78,7 @@ TEST(NegativeTests, ConfigParsingModelNotFound) { EXPECT_EQ(res, Result::ExitFailure); } -TEST(NegativeTests, ConfigParsingWrongLoggingLevel) { +TEST(ConfigParsingTests, WrongLoggingLevel) { char* test_argv[] = { const_cast("/path/to/binary"), const_cast("--logging_level"), const_cast("not a logging level"), diff --git a/onnxruntime/test/hosting/test_main.cc b/onnxruntime/test/hosting/unit_tests/test_main.cc similarity index 100% rename from onnxruntime/test/hosting/test_main.cc rename to onnxruntime/test/hosting/unit_tests/test_main.cc diff --git a/onnxruntime/test/hosting/util_tests.cc b/onnxruntime/test/hosting/unit_tests/util_tests.cc similarity index 88% rename from onnxruntime/test/hosting/util_tests.cc rename to onnxruntime/test/hosting/unit_tests/util_tests.cc index fcd87b66c66ac..9ed7aaa8f9334 100644 --- a/onnxruntime/test/hosting/util_tests.cc +++ b/onnxruntime/test/hosting/unit_tests/util_tests.cc @@ -12,7 +12,7 @@ namespace test { namespace protobufutil = google::protobuf::util; -TEST(PositiveTests, GetRequestContentTypeJson) { +TEST(RequestContentTypeTests, ContentTypeJson) { HttpContext context; http::request>> request{}; request.set(http::field::content_type, "application/json"); @@ -22,7 +22,7 @@ TEST(PositiveTests, GetRequestContentTypeJson) { EXPECT_EQ(result, SupportedContentType::Json); } -TEST(PositiveTests, GetRequestContentTypeRawData) { +TEST(RequestContentTypeTests, ContentTypeRawData) { HttpContext context; http::request>> request{}; request.set(http::field::content_type, "application/octet-stream"); @@ -40,7 +40,7 @@ TEST(PositiveTests, GetRequestContentTypeRawData) { EXPECT_EQ(result, SupportedContentType::PbByteArray); } -TEST(NegativeTests, GetRequestContentTypeUnknown) { +TEST(RequestContentTypeTests, ContentTypeUnknown) { HttpContext context; http::request>> request{}; request.set(http::field::content_type, "text/plain"); @@ -50,7 +50,7 @@ TEST(NegativeTests, GetRequestContentTypeUnknown) { EXPECT_EQ(result, SupportedContentType::Unknown); } -TEST(NegativeTests, GetRequestContentTypeMissing) { +TEST(RequestContentTypeTests, ContentTypeMissing) { HttpContext context; http::request>> request{}; context.request = request; @@ -59,7 +59,7 @@ TEST(NegativeTests, GetRequestContentTypeMissing) { EXPECT_EQ(result, SupportedContentType::Unknown); } -TEST(PositiveTests, GetResponseContentTypeJson) { +TEST(ResponseContentTypeTests, ContentTypeJson) { HttpContext context; http::request>> request{}; request.set(http::field::accept, "application/json"); @@ -69,7 +69,7 @@ TEST(PositiveTests, GetResponseContentTypeJson) { EXPECT_EQ(result, SupportedContentType::Json); } -TEST(PositiveTests, GetResponseContentTypeRawData) { +TEST(ResponseContentTypeTests, ContentTypeRawData) { HttpContext context; http::request>> request{}; request.set(http::field::accept, "application/octet-stream"); @@ -87,7 +87,7 @@ TEST(PositiveTests, GetResponseContentTypeRawData) { EXPECT_EQ(result, SupportedContentType::PbByteArray); } -TEST(NegativeTests, GetResponseContentTypeAny) { +TEST(ResponseContentTypeTests, ContentTypeAny) { HttpContext context; http::request>> request{}; request.set(http::field::accept, "*/*"); @@ -97,7 +97,7 @@ TEST(NegativeTests, GetResponseContentTypeAny) { EXPECT_EQ(result, SupportedContentType::PbByteArray); } -TEST(NegativeTests, GetResponseContentTypeUnknown) { +TEST(ResponseContentTypeTests, ContentTypeUnknown) { HttpContext context; http::request>> request{}; request.set(http::field::accept, "text/plain"); @@ -107,7 +107,7 @@ TEST(NegativeTests, GetResponseContentTypeUnknown) { EXPECT_EQ(result, SupportedContentType::Unknown); } -TEST(NegativeTests, GetResponseContentTypeMissing) { +TEST(ContentTypeTests, ContentTypeMissing) { HttpContext context; http::request>> request{}; context.request = request;