test for XmlReader

src/colorer/xml/libxml2/LibXmlInputSource.cpp

@@ -59,14 +59,22 @@ void LibXmlInputSource::initZipSource(const UnicodeString& path, const UnicodeSt
 PathInJar LibXmlInputSource::getFullPathsToZip(const UnicodeString& path, const UnicodeString* base)
 {
   if (path.startsWith(jar)) {
-    const auto path_idx = path.lastIndexOf('!');
+    auto local_path = colorer::Environment::expandSpecialEnvironment(path);
+    const auto path_idx = local_path.lastIndexOf('!');
     if (path_idx == -1) {
-      throw InputSourceException("Bad jar uri format: " + path);
+      throw InputSourceException("Bad jar uri format: " + local_path);
+    }
+
+    UnicodeString path_to_jar;
+    if (local_path.compare(path) == 0 ) {
+      path_to_jar = colorer::Environment::getAbsolutePath(
+              base ? *base : u"", UnicodeString(local_path, jar.length(), path_idx - jar.length()));
+    }else {
+      path_to_jar = colorer::Environment::getAbsolutePath(
+        u"", UnicodeString(local_path, jar.length(), path_idx - jar.length()));
     }
 
-    const UnicodeString path_to_jar = colorer::Environment::getAbsolutePath(
-        base ? *base : u"", UnicodeString(path, jar.length(), path_idx - jar.length()));
-    const UnicodeString path_in_jar(path, path_idx + 1);
+    const UnicodeString path_in_jar(local_path, path_idx + 1);
 
     const UnicodeString full_path = jar + path_to_jar + u"!" + path_in_jar;
     return {full_path, path_to_jar, path_in_jar};

src/colorer/xml/libxml2/LibXmlReader.h

@@ -10,7 +10,6 @@
 class LibXmlReader
 {
  public:
-  explicit LibXmlReader(const UnicodeString& source_file);
   explicit LibXmlReader(const XmlInputSource& source);
 
   ~LibXmlReader();
@@ -24,9 +23,10 @@ class LibXmlReader
   }
 
  private:
-  xmlDocPtr xmldoc {nullptr};
 
+  xmlDocPtr xmldoc {nullptr};
 
+  explicit LibXmlReader(const UnicodeString& source_file);
   static void getAttributes(const xmlNode* node, std::unordered_map<UnicodeString, UnicodeString>& data);
   void getChildren(xmlNode* node, XMLNode& result);
   bool populateNode(xmlNode* node, XMLNode& result);

tests/unit/CMakeLists.txt

@@ -7,6 +7,9 @@ set(unit_tests_SRC
     test_environment.cpp
     test_hrcparsing.cpp
     test_xmlinputsource.cpp
+    test_xmlreader.cpp
+    test_common.h
+    TestLogger.h
 )
 
 add_executable(unit_tests ${unit_tests_SRC})

tests/unit/TestLogger.h

@@ -0,0 +1,48 @@
+#ifndef TESTLOGGER_H
+#define TESTLOGGER_H
+
+#include <iostream>
+#include "colorer/common/Logger.h"
+
+class TestLogger : public Logger
+{
+ public:
+  static constexpr std::string_view LogLevelStr[] {"off", "error", "warning", "info", "debug", "trace"};
+
+  TestLogger() { current_level = LogLevel::LOG_WARN; }
+
+  ~TestLogger() override = default;
+
+  void log(Logger::LogLevel level, const char* /*filename_in*/, int /*line_in*/, const char* /*funcname_in*/,
+           const char* message) override
+  {
+    if (level > current_level) {
+      return;
+    }
+    log_messages.push_back(message);
+    //std::cerr << message << '\n';
+  }
+
+  bool message_exists() const { return !log_messages.empty(); }
+  bool message_print(bool waiting_exist = false) const
+  {
+    if (!waiting_exist && message_exists()) {
+      print_messages();
+    }
+    return !log_messages.empty();
+  }
+  void clean_messages() { log_messages.clear(); }
+  void print_messages() const
+  {
+    for (const auto& msg : log_messages) {
+      std::cerr << msg << '\n';
+    }
+  }
+
+  std::vector<std::string> log_messages;
+
+ private:
+  Logger::LogLevel current_level = Logger::LOG_OFF;
+};
+
+#endif  // TESTLOGGER_H

tests/unit/data/catalog-allpacked-env.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catalog [
+        <!ENTITY hrd "jar:common-allpacked.zip!hrd">
+        <!ENTITY catalog-console SYSTEM "jar:$CUR_DIR/data/common-allpacked.zip!hrd/catalog-console.xml">
+        ]>
+<catalog xmlns="http://colorer.github.io/schema/v1/catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://colorer.github.io/schema/v1/catalog https://colorer.github.io/schema/v1/catalog.xsd">
+    <hrc-sets>
+        <location link="jar:common.zip!hrc/proto.hrc" />
+        <location link="auto" />
+    </hrc-sets>
+    <hrd-sets>
+        &catalog-console;
+    </hrd-sets>
+</catalog>

tests/unit/data/catalog-allpacked.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catalog [
+        <!ENTITY hrd "jar:common-allpacked.zip!hrd">
+        <!ENTITY catalog-console SYSTEM "jar:common-allpacked.zip!hrd/catalog-console.xml">
+        ]>
+<catalog xmlns="http://colorer.github.io/schema/v1/catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://colorer.github.io/schema/v1/catalog https://colorer.github.io/schema/v1/catalog.xsd">
+    <hrc-sets>
+        <location link="jar:common.zip!hrc/proto.hrc" />
+        <location link="auto" />
+    </hrc-sets>
+    <hrd-sets>
+        &catalog-console;
+    </hrd-sets>
+</catalog>

tests/unit/data/catalog-env.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catalog [
+        <!ENTITY hrd "hrd">
+        <!ENTITY catalog-console SYSTEM "env:$CUR_DIR/data/hrd/catalog-console.xml">
+        ]>
+<catalog xmlns="http://colorer.github.io/schema/v1/catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://colorer.github.io/schema/v1/catalog https://colorer.github.io/schema/v1/catalog.xsd">
+    <hrc-sets>
+        <location link="hrc/proto.hrc" />
+        <location link="hrc/auto" />
+    </hrc-sets>
+    <hrd-sets>
+        &catalog-console;
+    </hrd-sets>
+</catalog>

tests/unit/data/catalog.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catalog [
+        <!ENTITY hrd "hrd">
+        <!ENTITY catalog-console SYSTEM "hrd/catalog-console.xml">
+        ]>
+<catalog xmlns="http://colorer.github.io/schema/v1/catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://colorer.github.io/schema/v1/catalog https://colorer.github.io/schema/v1/catalog.xsd">
+    <hrc-sets>
+        <location link="hrc/proto.hrc" />
+        <location link="hrc/auto" />
+    </hrc-sets>
+    <hrd-sets>
+        &catalog-console;
+    </hrd-sets>
+</catalog>

tests/unit/data/hrd/catalog-console.xml

@@ -0,0 +1,3 @@
+<hrd class="console" name="default" description="Aqua on blue">
+    <location link="&hrd;/console/default.hrd"/>
+</hrd>

tests/unit/data/type_cue.hrc

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hrc>
+  <prototype name="cue" group="other" description="Cue sheet">
+    <filename>/\.cue$/</filename>
+	<parameters>
+      <param value='1' description="lines for 'firstline'"/>
+      <param name='firstlinebytes' value='5' description="bytes for 'firstline'"/>
+    </parameters>
+  </prototype>
+	<type name="cue">
+	</type>
+</hrc>

tests/unit/test_common.h

@@ -0,0 +1,8 @@
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
+
+#include "TestLogger.h"
+
+extern std::unique_ptr<TestLogger> logger;
+
+#endif //TEST_COMMON_H

tests/unit/test_hrcparsing.cpp

@@ -5,33 +5,11 @@
 
 namespace fs = std::filesystem;
 
-TEST_CASE("Create files")
-{
-  auto file1_str = R"(<?xml version="1.0" encoding="UTF-8"?>
-<hrc>
-  <prototype name="cue" group="other" description="Cue sheet">
-    <filename>/\.cue$/</filename>
-	<parameters>
-      <param value='1' description="lines for 'firstline'"/>
-      <param name='firstlinebytes' value='5' description="bytes for 'firstline'"/>
-    </parameters>
-  </prototype>
-	<type name="cue">
-	</type>
-</hrc>
-)";
-  auto temp_path = fs::current_path();
-  auto work_dir = temp_path / "test1.hrc";
-  std::ofstream file_handler;
-  file_handler.open(work_dir.c_str());
-  file_handler << file1_str;
-  file_handler.close();
-}
 
 TEST_CASE("Load hrc")
 {
   auto temp_path = fs::current_path();
-  auto work_dir = temp_path / "test1.hrc";
+  auto work_dir = temp_path / "data/type_cue.hrc";
   auto uwork_dir = UnicodeString(work_dir.c_str());
   XmlInputSource file1(uwork_dir, nullptr);
   HrcLibrary lib;

tests/unit/test_main.cpp

@@ -1,10 +1,12 @@
 #define CATCH_CONFIG_MAIN
 
 #include <catch2/catch.hpp>
-#include "colorer/Common.h"
+#include "test_common.h"
 
+std::unique_ptr<TestLogger> logger;
 
-
-TEST_CASE("All test cases reside in other .cpp files") {
-
+TEST_CASE("All test cases reside in other .cpp files")
+{
+  logger = std::make_unique<TestLogger>();
+  Log::registerLogger(*logger);
 }