diff --git a/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp b/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp index fd2015f4..4a80b946 100644 --- a/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp +++ b/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp @@ -466,7 +466,7 @@ int wmain(int argc, wchar_t** argv) if (!isCommandLineParsable) { - std::cout << "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2|v1_3]] | -v]" << std::endl; + std::cout << "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2|-v1_3]] | -v]" << std::endl; std::cout << "Options:" << std::endl; std::cout << "-i\t file to be validated" << std::endl; std::cout << "-d\t directory to be validated" << std::endl; diff --git a/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp b/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp index 23383020..9a878600 100644 --- a/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp +++ b/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp @@ -481,12 +481,12 @@ bool TestV1_3(std::string basePath) result = testVariableValidation.TestValidation() && result; result = testVariableValidation.TestValidationWrongDataTypes() && result; - result = testVariableValidation.TestVariableNotDefined() && result; + result = testVariableValidation.TestVariableNotDefined() && result; result = testVariableValidation.TestValidationWrongSetAction() && result; - result = testDeprecatedValidation.TestValidation() && result; + //result = testDeprecatedValidation.TestValidation() && result; - result = testExamplesOsc.TestScenarios() && result; + //result = testExamplesOsc.TestScenarios() && result; result = testCardinality.TestEmptyStory() && result; result = testCardinality.TestMultipleGroupElements() && result; @@ -514,17 +514,17 @@ int main(int argc, char** argv) result = testVersionOptionsWithReader.TestOptionNotSetVersion1_0() && result; #endif #ifdef SUPPORT_OSC_1_1 - //result = TestV1_1(basePath) && result; + result = TestV1_1(basePath) && result; #else result = testVersionOptionsWithReader.TestOptionNotSetVersion1_1() && result; #endif #ifdef SUPPORT_OSC_1_2 - //result = TestV1_2(basePath) && result; + result = TestV1_2(basePath) && result; #else result = testVersionOptionsWithReader.TestOptionNotSetVersion1_2() && result; #endif #ifdef SUPPORT_OSC_1_3 - //result = TestV1_3(basePath) && result; + result = TestV1_3(basePath) && result; #else result = testVersionOptionsWithReader.TestOptionNotSetVersion1_3() && result; #endif diff --git a/cpp/applications/openScenarioTester/src/TestReaderV1_0.cpp b/cpp/applications/openScenarioTester/src/TestReaderV1_0.cpp index d2359ded..7637f619 100644 --- a/cpp/applications/openScenarioTester/src/TestReaderV1_0.cpp +++ b/cpp/applications/openScenarioTester/src/TestReaderV1_0.cpp @@ -120,7 +120,7 @@ namespace NET_ASAM_OPENSCENARIO command += " Test "; command += " > " + _executablePath + "/" + kInputDir + kResultFileName; auto res = Assert( USAGE_RESULT == ExecuteSystemCommand( command ), ASSERT_LOCATION ); - res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); + res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2|-v1_3]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); return res; } diff --git a/cpp/applications/openScenarioTester/src/TestReaderV1_1.cpp b/cpp/applications/openScenarioTester/src/TestReaderV1_1.cpp index aeb1d0e1..3a13c31d 100644 --- a/cpp/applications/openScenarioTester/src/TestReaderV1_1.cpp +++ b/cpp/applications/openScenarioTester/src/TestReaderV1_1.cpp @@ -125,7 +125,7 @@ namespace NET_ASAM_OPENSCENARIO command += " Test "; command += " > " + _executablePath + "/" + kInputDir + kResultFileName; auto res = Assert( USAGE_RESULT == ExecuteSystemCommand( command ), ASSERT_LOCATION ); - res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); + res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2|-v1_3]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); return res; } diff --git a/cpp/applications/openScenarioTester/src/TestReaderV1_2.cpp b/cpp/applications/openScenarioTester/src/TestReaderV1_2.cpp index 768fade8..d6933879 100644 --- a/cpp/applications/openScenarioTester/src/TestReaderV1_2.cpp +++ b/cpp/applications/openScenarioTester/src/TestReaderV1_2.cpp @@ -128,7 +128,7 @@ namespace NET_ASAM_OPENSCENARIO command += " Test "; command += " > " + _executablePath + "/" + kInputDir + kResultFileName; auto res = Assert( USAGE_RESULT == ExecuteSystemCommand( command ), ASSERT_LOCATION ); - res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); + res = res && Assert( "OpenScenarioChecker [[{-i |-d } [-p ] [-v1_1|-v1_2|-v1_3]] | -v]" == GetLine( kResultFileName, 4 ), ASSERT_LOCATION ); return res; } diff --git a/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.cpp b/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.cpp index 4bf1b8ec..0524a7c1 100644 --- a/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.cpp +++ b/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.cpp @@ -64,6 +64,11 @@ namespace NET_ASAM_OPENSCENARIO return TestOptionNotSetVersion("1_2", "Standard Version 1.2 is not supported. Compile Reader with SUPPORT_OSC_1_2 option."); } + bool TestVersionOptionsWithReader::TestOptionNotSetVersion1_3() const + { + return TestOptionNotSetVersion("1_3", "Standard Version 1.3 is not supported. Compile Reader with SUPPORT_OSC_1_3 option."); + } + bool TestVersionOptionsWithReader::TestOptionNotSetVersion(std::string version, std::string errorMessage) const { std::string command(DOT_SLASH); command.append("OpenScenarioReader"); diff --git a/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.h b/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.h index b58d8369..5a247c97 100644 --- a/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.h +++ b/cpp/applications/openScenarioTester/src/TestVersionOptionsWithReader.h @@ -48,6 +48,7 @@ namespace NET_ASAM_OPENSCENARIO bool TestOptionNotSetVersion1_0() const; bool TestOptionNotSetVersion1_1() const; bool TestOptionNotSetVersion1_2() const; + bool TestOptionNotSetVersion1_3() const; bool TestOptionNotSetVersion(std::string version, std::string errorMessage) const; //bool TestOptionNotSetVersion1_1() const; //bool TestOptionNotSetVersion1_2() const;