From 6af8e398ddd56eda8a34941c8f4531d34f2f2012 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sat, 27 Jan 2024 22:30:26 -0600
Subject: [PATCH] Adding 2002 ARCHIVE2 file to Level 2 test set

---
 test/data                                  |  2 +-
 test/source/scwx/wsr88d/ar2v_file.test.cpp | 33 +++++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/test/data b/test/data
index 6632ffd6..e3e743a5 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 6632ffd6ba35b799dd803e9711281d54a3858a29
+Subproject commit e3e743a5cc9c065d05f00151380fea892fb2156c
diff --git a/test/source/scwx/wsr88d/ar2v_file.test.cpp b/test/source/scwx/wsr88d/ar2v_file.test.cpp
index 03b0a25b..097fb69c 100644
--- a/test/source/scwx/wsr88d/ar2v_file.test.cpp
+++ b/test/source/scwx/wsr88d/ar2v_file.test.cpp
@@ -1,7 +1,5 @@
 #include <scwx/wsr88d/ar2v_file.hpp>
 
-#include <fstream>
-
 #include <gtest/gtest.h>
 
 namespace scwx
@@ -9,25 +7,32 @@ namespace scwx
 namespace wsr88d
 {
 
-TEST(ar2v_file, klsx)
+class Ar2vValidFileTest :
+    public testing::TestWithParam<std::pair<std::string, std::size_t>>
 {
+};
+
+TEST_P(Ar2vValidFileTest, ValidFile)
+{
+   auto& param = GetParam();
+
    Ar2vFile file;
    bool     fileValid =
-      file.LoadFile(std::string(SCWX_TEST_DATA_DIR) +
-                    "/nexrad/level2/Level2_KLSX_20210527_1757.ar2v");
+      file.LoadFile(std::string(SCWX_TEST_DATA_DIR) + param.first);
 
    EXPECT_EQ(fileValid, true);
+   EXPECT_EQ(file.message_count(), param.second);
 }
 
-TEST(ar2v_file, tstl)
-{
-   Ar2vFile file;
-   bool     fileValid =
-      file.LoadFile(std::string(SCWX_TEST_DATA_DIR) +
-                    "/nexrad/level2/Level2_TSTL_20220213_2357.ar2v");
-
-   EXPECT_EQ(fileValid, true);
-}
+INSTANTIATE_TEST_SUITE_P(
+   Ar2vFile,
+   Ar2vValidFileTest,
+   testing::Values(std::pair<std::string, std::size_t> //
+                   {"/nexrad/level2/KCLE20021110_221234", 4031},
+                   std::pair<std::string, std::size_t> //
+                   {"/nexrad/level2/Level2_KLSX_20210527_1757.ar2v", 11167},
+                   std::pair<std::string, std::size_t> //
+                   {"/nexrad/level2/Level2_TSTL_20220213_2357.ar2v", 5763}));
 
 } // namespace wsr88d
 } // namespace scwx