Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename experimental JSON tests. #15568

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Rename experimental JSON tests. #15568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89d8f7
Rename experimental JSON tests.
bdice Apr 18, 2024
1609a11
Rename test parameter.
bdice Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cpp/tests/io/json_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,14 @@ struct JsonReaderTest : public cudf::test::BaseFixture {};
*/
enum class json_test_t {
// Run test with the nested JSON lines reader using record-orient input data
json_experimental_record_orient,
json_record_orient,
// Run test with the nested JSON lines reader using row-orient input data
json_experimental_row_orient
json_row_orient
};

constexpr bool is_row_orient_test(json_test_t test_opt)
{
return test_opt == json_test_t::json_experimental_row_orient;
return test_opt == json_test_t::json_row_orient;
}

/**
Expand Down Expand Up @@ -267,13 +267,13 @@ TYPED_TEST_SUITE(JsonValidFixedPointReaderTest, cudf::test::FixedPointTypes);
// Parametrize qualifying JSON tests for executing both nested reader and legacy JSON lines reader
INSTANTIATE_TEST_CASE_P(JsonReaderParamTest,
JsonReaderParamTest,
::testing::Values(json_test_t::json_experimental_record_orient,
json_test_t::json_experimental_row_orient));
::testing::Values(json_test_t::json_record_orient,
json_test_t::json_row_orient));

// Parametrize qualifying JSON tests for executing both nested reader and legacy JSON lines reader
INSTANTIATE_TEST_CASE_P(JsonReaderRecordTest,
JsonReaderRecordTest,
::testing::Values(json_test_t::json_experimental_record_orient));
::testing::Values(json_test_t::json_record_orient));

TEST_P(JsonReaderParamTest, BasicJsonLines)
{
Expand Down Expand Up @@ -1223,9 +1223,9 @@ TEST_F(JsonReaderTest, DISABLED_BadDtypeParams)
EXPECT_THROW(cudf::io::read_json(options_map), cudf::logic_error);
}

TEST_F(JsonReaderTest, JsonExperimentalBasic)
TEST_F(JsonReaderTest, JsonBasic)
{
std::string const fname = temp_env->get_temp_dir() + "JsonExperimentalBasic.json";
std::string const fname = temp_env->get_temp_dir() + "JsonBasic.json";
std::ofstream outfile(fname, std::ofstream::out);
outfile << R"([{"a":"11", "b":"1.1"},{"a":"22", "b":"2.2"}])";
outfile.close();
Expand All @@ -1249,7 +1249,7 @@ TEST_F(JsonReaderTest, JsonExperimentalBasic)
cudf::test::strings_column_wrapper({"1.1", "2.2"}));
}

TEST_F(JsonReaderTest, JsonExperimentalLines)
TEST_F(JsonReaderTest, JsonLines)
{
std::string const json_string =
R"({"a":"a0"}
Expand Down Expand Up @@ -1416,7 +1416,7 @@ TEST_F(JsonReaderTest, TokenAllocation)
}
}

TEST_F(JsonReaderTest, ExperimentalLinesNoOmissions)
TEST_F(JsonReaderTest, LinesNoOmissions)
{
std::array<std::string const, 4> const json_inputs
// single column
Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/io/nested_json_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ TEST_F(JsonTest, TokenStream2)
}

struct JsonParserTest : public cudf::test::BaseFixture, public testing::WithParamInterface<bool> {};
INSTANTIATE_TEST_SUITE_P(Experimental, JsonParserTest, testing::Bool());
INSTANTIATE_TEST_SUITE_P(IsFullGPU, JsonParserTest, testing::Bool());

TEST_P(JsonParserTest, ExtractColumn)
{
Expand Down
Loading