diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc index 10a6a7362..d0b2eaf14 100644 --- a/src/lym/unit_tests/lymBasicTests.cc +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -28,6 +28,7 @@ #include "gsiInterpreter.h" #include "rba.h" #include "pya.h" +#include "tlFileUtils.h" class TestCollectorConsole : public gsi::Console @@ -52,6 +53,11 @@ private: std::string m_text; }; +static std::string np (const std::string &s) +{ + return tl::replaced (s, "\\", "/"); +} + #if defined(HAVE_RUBY) TEST(1_BasicRuby) @@ -120,7 +126,7 @@ TEST(3_RubyInclude) throw; } - EXPECT_EQ (console.text (), "An error in " + tl::testsrc () + "/testdata/lym/b_inc.rb:3\n"); + EXPECT_EQ (np (console.text ()), np ("An error in " + tl::testsrc () + "/testdata/lym/b_inc.rb:3\n")); } TEST(11_DRCBasic) diff --git a/src/tl/unit_tests/tlIncludeTests.cc b/src/tl/unit_tests/tlIncludeTests.cc index bbb56dc66..924a4510c 100644 --- a/src/tl/unit_tests/tlIncludeTests.cc +++ b/src/tl/unit_tests/tlIncludeTests.cc @@ -26,6 +26,11 @@ #include "tlStream.h" #include "tlInclude.h" +static std::string np (const std::string &s) +{ + return tl::replaced (s, "\\", "/"); +} + TEST(1_simple) { std::string fn = tl::testsrc () + "/testdata/tl/x.txt"; @@ -48,12 +53,12 @@ TEST(2_single_include) tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, tl::InputStream (fn).read_all (), et); EXPECT_EQ (et, "A line\nincluded.1\nAnother line\n"); - EXPECT_EQ (ie.to_string (), "@1*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;2*" + tl::testsrc () + "/testdata/tl/inc1.txt*-1;3*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;"); + EXPECT_EQ (np (ie.to_string ()), np ("@1*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;2*" + tl::testsrc () + "/testdata/tl/inc1.txt*-1;3*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;")); EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc1.txt"); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc1.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); EXPECT_EQ (ie.translate_to_original (3).first, fn); EXPECT_EQ (ie.translate_to_original (3).second, 3); @@ -71,11 +76,11 @@ TEST(3_multi_include) EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc3.txt"); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/tl/inc2.txt"); + EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testsrc () + "/testdata/tl/inc2.txt")); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/tl/inc3.txt"); + EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3); @@ -93,11 +98,11 @@ TEST(4_multi_include_interpolate) EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc3.txt"); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/tl/inc2.txt"); + EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testsrc () + "/testdata/tl/inc2.txt")); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/tl/inc3.txt"); + EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3);