Skip to content

VDB-5563 allowing empty METHOD in GCP #3

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

Open
aboshkin wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

VDB-5563 allowing empty METHOD in GCP #3

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
80a1262
VDB-5563 allowing empty METHOD in GCP
aboshkin Jun 20, 2024
6dcc790
VDB-5663 added an include, incremented GCP parser vesion
aboshkin Jun 21, 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
1 change: 1 addition & 0 deletions parser/gcp/GCP_Interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "ParserInterface.hpp"

#include <memory>
#include <string>

namespace NCBI
{
Expand Down
2 changes: 1 addition & 1 deletion parser/gcp/gcp2jsn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using namespace NCBI::Logging;

std::string tool_version( "1.1.0" );
std::string tool_version( "1.1.1" );

int main ( int argc, char * argv [], const char * envp [] )
{
Expand Down
1 change: 1 addition & 0 deletions parser/gcp/gcp_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ ip_region

method
: QUOTE QSTR QUOTE { $$ = $2; lib->set( GCPReceiver::method, $2 ); }
| QUOTE QUOTE { lib->set( GCPReceiver::method, EmptyTSTR ); }
;

status
Expand Down
7 changes: 7 additions & 0 deletions parser/gcp/gcp_test_parse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@ TEST_F( GCPTestFixture, header_bad )
ASSERT_NE( "", s );
}

TEST_F( GCPTestFixture, VDB_5563 )
{ // allow empty method
string res = try_to_parse_good(
"\"1714445214573584\",\"\",\"\",\"\",\"\",\"\",\"200\",\"\",\"\",\"\",\"\",\"\",\"GCS Lifecycle Management\",\"d8c3fedc1503d12e1e1b797027e52ed3\",\"\",\"sra-pub-crun-7\",\"\"" );
ASSERT_NE( "", res );
}

extern "C"
{
int main ( int argc, const char * argv [], const char * envp [] )
Expand Down