Added rexs 1.5 model database version (#21)

closes #21
fva-net · Mar 28, 2023 · 270c3c8 · 270c3c8
1 parent 7c7a1cd
commit 270c3c8
Show file tree

Hide file tree

Showing 6 changed files with 11,226 additions and 4 deletions.
diff --git a/include/rexsapi/Types.hxx b/include/rexsapi/Types.hxx
@@ -352,6 +352,10 @@ namespace rexsapi
     if (type == "array_of_integer_arrays") {
       return TValueType::ARRAY_OF_INTEGER_ARRAYS;
     }
+    if (type == "date_time") {
+      // TODO(LCF): just to make the 1.5 version working
+      return TValueType::STRING;
+    }
     throw TException{fmt::format("unknown value type '{}'", type)};
   }
 

diff --git a/models/rexs_model_1.5_de.xml b/models/rexs_model_1.5_de.xml
diff --git a/models/rexs_model_1.5_en.xml b/models/rexs_model_1.5_en.xml
diff --git a/test/database/FileResourceLoaderTest.cxx b/test/database/FileResourceLoaderTest.cxx
@@ -43,7 +43,7 @@ TEST_CASE("File resource loader test")
       buffers.emplace_back(buffer);
     });
 
-    CHECK(buffers.size() == 10);
+    CHECK(buffers.size() == 12);
     std::for_each(buffers.begin(), buffers.end(), [](const auto& buf) {
       checkBuffer(buf);
     });

diff --git a/test/database/ModelRegistryTest.cxx b/test/database/ModelRegistryTest.cxx
@@ -54,14 +54,14 @@ TEST_CASE("Test rexs model registry")
   SUBCASE("Get non existing model non-strict mode")
   {
     const auto& model = registry.getModel(rexsapi::TRexsVersion{"1.99"}, "de", false);
-    CHECK(model.getVersion() == rexsapi::TRexsVersion{"1.4"});
+    CHECK(model.getVersion() == rexsapi::TRexsVersion{"1.5"});
     CHECK(model.getLanguage() == "de");
   }
 
   SUBCASE("Get non existing model non-strict mode with unknown language")
   {
     const auto& model = registry.getModel(rexsapi::TRexsVersion{"1.99"}, "es", false);
-    CHECK(model.getVersion() == rexsapi::TRexsVersion{"1.4"});
+    CHECK(model.getVersion() == rexsapi::TRexsVersion{"1.5"});
     CHECK(model.getLanguage() == "en");
   }
 }
diff --git a/test/database/XMLModelLoaderTest.cxx b/test/database/XMLModelLoaderTest.cxx
@@ -67,7 +67,7 @@ TEST_CASE("XML database model loader test")
     });
 
     CHECK(result);
-    REQUIRE(models.size() == 10);
+    REQUIRE(models.size() == 12);
     std::set<std::string, std::less<>> languages;
     for (const auto& model : models) {
       languages.insert(model.getLanguage());