From e710d42fc0b112ba753ceeb10f2a1b27a398cfef Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 5 Feb 2020 19:42:44 +0100 Subject: [PATCH] eolian_cxx: fix a last few since errors sinace has to be > 1.22 and the tests need to reflect that. --- src/tests/eolian_cxx/docs.eo | 6 ++--- .../eolian_cxx_test_documentation.cc | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tests/eolian_cxx/docs.eo b/src/tests/eolian_cxx/docs.eo index 6e8d4bc290..d18dcce344 100644 --- a/src/tests/eolian_cxx/docs.eo +++ b/src/tests/eolian_cxx/docs.eo @@ -31,7 +31,7 @@ enum Bar { type Alias: Bar; [[Docs for typedef. More docs for typedef. - See @Bar. @since 2.0 + See @Bar. @since 1.66 ]] const pants: int = 150; [[Docs for var. @since 1.66]] @@ -54,7 +54,7 @@ class Docs { @Bar.foo @Docs - @since 1.17 + @since 1.66 ]] methods { meth { @@ -69,7 +69,7 @@ class Docs { @property prop { [[Property common documentation. - @since 1.18 + @since 1.66 ]] get { [[Get documentation.]] diff --git a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc index eb683e3312..a0372b3606 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc @@ -70,7 +70,7 @@ EFL_START_TEST(eolian_cxx_test_class_docs) "@Foo.field1 " "@Bar.foo " "@Docs"); - ck_assert_str_eq(doc.since.c_str(), "1.17"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); } EFL_END_TEST @@ -89,12 +89,12 @@ EFL_START_TEST(eolian_cxx_test_function_docs) documentation_def doc = func.documentation; ck_assert_str_eq(doc.summary.c_str(), "Method documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); // Since is inherited from parent if not present, except when no doc is present ofr this member. + ck_assert_str_eq(doc.since.c_str(), "1.66"); // Since is inherited from parent if not present, except when no doc is present ofr this member. doc = func.return_documentation; ck_assert_str_eq(doc.summary.c_str(), "Return documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); auto param_iter = func.parameters.begin(); @@ -102,7 +102,7 @@ EFL_START_TEST(eolian_cxx_test_function_docs) doc = param_iter->documentation; ck_assert_str_eq(doc.summary.c_str(), "Param documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); param_iter++; @@ -118,7 +118,7 @@ EFL_START_TEST(eolian_cxx_test_function_docs) doc = param_iter->documentation; ck_assert_str_eq(doc.summary.c_str(), "Another param documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); } EFL_END_TEST @@ -140,12 +140,12 @@ EFL_START_TEST(eolian_cxx_test_property_docs) documentation_def doc = func.property_documentation; ck_assert_str_eq(doc.summary.c_str(), "Property common documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.18"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); doc = func.documentation; // Actual getdocumentation. ck_assert_str_eq(doc.summary.c_str(), "Get documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); // Members inherit from parent *class* + ck_assert_str_eq(doc.since.c_str(), "1.66"); // Members inherit from parent *class* func_iter = std::find_if(klass.functions.begin(), klass.functions.end(), [](const function_def& f) { @@ -158,13 +158,13 @@ EFL_START_TEST(eolian_cxx_test_property_docs) doc = func.documentation; // Actual getdocumentation. ck_assert_str_eq(doc.summary.c_str(), "Set documentation."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); // Members inherit from parent *class* + ck_assert_str_eq(doc.since.c_str(), "1.66"); // Members inherit from parent *class* auto property_iter = klass.properties.begin(); auto property = *property_iter; doc = property.documentation; ck_assert_str_eq(doc.summary.c_str(), "Property common documentation."); - ck_assert_str_eq(doc.since.c_str(), "1.18"); + ck_assert_str_eq(doc.since.c_str(), "1.66"); } EFL_END_TEST @@ -180,7 +180,7 @@ EFL_START_TEST(eolian_cxx_test_event_docs) documentation_def doc = event.documentation; ck_assert_str_eq(doc.summary.c_str(), "Event docs."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), "1.17"); // Members inherit from parent *class* + ck_assert_str_eq(doc.since.c_str(), "1.66"); // Members inherit from parent *class* } EFL_END_TEST @@ -198,7 +198,7 @@ EFL_START_TEST(eolian_cxx_test_enum_docs) documentation_def doc = _enum.documentation; ck_assert_str_eq(doc.summary.c_str(), "Docs for enum Bar."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), ""); + ck_assert_str_eq(doc.since.c_str(), "1.66"); // fields auto field_iter = _enum.fields.begin(); @@ -215,7 +215,7 @@ EFL_START_TEST(eolian_cxx_test_enum_docs) doc = field_iter->documentation; ck_assert_str_eq(doc.summary.c_str(), "Docs for foo."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), ""); + ck_assert_str_eq(doc.since.c_str(), "1.66"); field_iter++; @@ -223,7 +223,7 @@ EFL_START_TEST(eolian_cxx_test_enum_docs) doc = field_iter->documentation; ck_assert_str_eq(doc.summary.c_str(), "Docs for bar."); ck_assert_str_eq(doc.description.c_str(), ""); - ck_assert_str_eq(doc.since.c_str(), ""); + ck_assert_str_eq(doc.since.c_str(), "1.66"); } EFL_END_TEST