From 455d829f2fc29af96af124c2900dafcd2144afce Mon Sep 17 00:00:00 2001
From: Geoffrey Merck <F4FXL@users.noreply.github.com>
Date: Wed, 17 Dec 2025 20:22:02 +0100
Subject: [PATCH] add test suite for Ambefilereader, fix a bug where last word
 was not read #60

---
 DStarBase/AMBEFileReader.cpp          |   2 +-
 Tests/AMBEFileReader/TIME_fr_FR2.ambe | Bin 0 -> 8941 bytes
 Tests/AMBEFileReader/TIME_fr_FR2.indx |  20 +++++++++++
 Tests/AMBEFileReader/lookup.cpp       |  47 ++++++++++++++++++--------
 4 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 Tests/AMBEFileReader/TIME_fr_FR2.ambe
 create mode 100644 Tests/AMBEFileReader/TIME_fr_FR2.indx

diff --git a/DStarBase/AMBEFileReader.cpp b/DStarBase/AMBEFileReader.cpp
index 119ea4a..349a811 100644
--- a/DStarBase/AMBEFileReader.cpp
+++ b/DStarBase/AMBEFileReader.cpp
@@ -141,7 +141,7 @@ bool CAMBEFileReader::readIndex()
 				unsigned long start  = std::stoul(strt);
 				unsigned long length = std::stoul(leng);
 
-				if (start >= m_ambeLength || (start + length) >= m_ambeLength)
+				if (start >= m_ambeLength || (start + length) > m_ambeLength)
 					CLog::logInfo("The start or end for *%s* is out of range, start: %lu, end: %lu\n", name.c_str(), start, start + length);
 				else
 					m_index[name] = new CIndexRecord(name, start + SILENCE_LENGTH, length);
diff --git a/Tests/AMBEFileReader/TIME_fr_FR2.ambe b/Tests/AMBEFileReader/TIME_fr_FR2.ambe
new file mode 100644
index 0000000000000000000000000000000000000000..6239b56621cb3f4b3390d153a9c3229818500002
GIT binary patch
literal 8941
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
DRm$L-

literal 0
HcmV?d00001

diff --git a/Tests/AMBEFileReader/TIME_fr_FR2.indx b/Tests/AMBEFileReader/TIME_fr_FR2.indx
new file mode 100644
index 0000000..dd43877
--- /dev/null
+++ b/Tests/AMBEFileReader/TIME_fr_FR2.indx
@@ -0,0 +1,20 @@
+bonjour	0	66
+cinq	66	50
+deux	116	43
+dix	159	53
+et_demie	212	52
+et_quart	264	53
+heure	317	44
+heures	361	44
+huit	405	49
+il_est	454	44
+midi	498	50
+minuit	548	50
+moins_le_quart	598	64
+neuf	662	51
+onze	713	47
+quatre	760	49
+sept	809	46
+six	855	52
+trois	907	41
+une	948	45
diff --git a/Tests/AMBEFileReader/lookup.cpp b/Tests/AMBEFileReader/lookup.cpp
index 9f75475..6fcdd27 100644
--- a/Tests/AMBEFileReader/lookup.cpp
+++ b/Tests/AMBEFileReader/lookup.cpp
@@ -71,30 +71,47 @@ namespace AMBEFileReaderTests
         std::vector<CAMBEData *> data;
         res = reader.lookup("0", data);
         EXPECT_FALSE(res) << "read shall return false on non existent file";
-
-        for(auto d : data) {
-            delete d;
-        }
+        for(auto d : data)  delete d;
     }
 
-    TEST_F(AMBEFileReader_lookup, validId)
+    class AMBEFileReader_lookup_Param : public ::testing::TestWithParam<std::string> {};
+    TEST_P(AMBEFileReader_lookup_Param, validId)
     {
-        std::string indexFile = std::string(std::filesystem::current_path()) + "/AMBEFileReader/fr_FR.indx";
-        std::string ambeFile = std::string(std::filesystem::current_path()) + "/AMBEFileReader/fr_FR.ambe";
+        std::string indexFile = (std::filesystem::current_path() / "AMBEFileReader/TIME_fr_FR2.indx").string();
+        std::string ambeFile  = (std::filesystem::current_path() / "AMBEFileReader/TIME_fr_FR2.ambe").string();
+
         CAMBEFileReader reader(indexFile, ambeFile);
         bool res = reader.read();
-        EXPECT_TRUE(res) << "read shall return true on existent files";
+        ASSERT_TRUE(res) << "read shall return true on existent files";
 
-        std::vector<CAMBEData *> data;
-        res = reader.lookup("0", data);
-        EXPECT_TRUE(res) << "read shall return true on existent files and valid Id";
-        EXPECT_NE(data.size(), 0U) << "Vector shall contain data";
+        std::vector<CAMBEData*> data;
+        const std::string& id = GetParam();
 
-        for(auto d : data) {
-            delete d;
-        }
+        res = reader.lookup(id, data);
+        EXPECT_TRUE(res) << "lookup shall return true on valid Id: " << id;
+        EXPECT_NE(data.size(), 0U) << "Vector shall contain data for Id: " << id;
+
+        for (auto* d : data) delete d;
     }
 
+    static std::string ParamName(
+        const ::testing::TestParamInfo<std::string>& info)
+    {
+        return info.param;
+    }
+
+    INSTANTIATE_TEST_SUITE_P(
+        AmbeFileReader_lookup_validIds,
+        AMBEFileReader_lookup_Param,
+        ::testing::Values(
+            "bonjour", "cinq", "deux", "dix", "et_demie", "et_quart",
+            "heure", "heures", "huit", "il_est", "midi", "minuit",
+            "moins_le_quart", "neuf", "onze", "quatre", "sept",
+            "six", "trois", "une"
+        ),
+        ParamName
+    );
+
     TEST_F(AMBEFileReader_lookup, invalidId)
     {
         std::string indexFile = std::string(std::filesystem::current_path()) + "/AMBEFileReader/fr_FR.indx";