From 9192ba3c330e5895628785fa822ec18cfa3ecf45 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 6 Aug 2020 17:08:02 -0700
Subject: [PATCH] test shuffle

---
 test/testdata.cpp  | 52 +-------------------------------------------
 test/testpvreq.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/test/testdata.cpp b/test/testdata.cpp
index 8c5246a..5ba2e78 100644
--- a/test/testdata.cpp
+++ b/test/testdata.cpp
@@ -14,7 +14,6 @@
 #include "utilpvt.h"
 #include "pvaproto.h"
 #include "dataimpl.h"
-#include "pvrequest.h"
 
 using namespace pvxs;
 namespace  {
@@ -205,54 +204,6 @@ void testIterUnion()
     }
 }
 
-void testPvRequest()
-{
-    namespace M = members;
-
-    testDiag("%s", __func__);
-
-    auto def = nt::NTScalar{TypeCode::String}.build();
-    auto val = def.create();
-    testShow()<<val;
-
-    {
-        auto rdef = TypeDef(TypeCode::Struct, {
-                                M::Struct("field", {})
-                            });
-
-        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
-
-        testEq(mask, BitMask({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, 10u));
-    }
-
-    {
-        auto rdef = TypeDef(TypeCode::Struct, {
-                                M::Struct("field", {
-                                    M::Struct("value", {}),
-                                })
-                            });
-
-        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
-
-        testEq(mask, BitMask({0, 1}, 10u));
-    }
-
-    {
-        auto rdef = TypeDef(TypeCode::Struct, {
-                                M::Struct("field", {
-                                    M::Struct("timeStamp", {}),
-                                    M::Struct("alarm", {
-                                        M::Struct("status", {}),
-                                    }),
-                                })
-                            });
-
-        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
-
-        testEq(mask, BitMask({0, 2, 4, 6, 7, 8, 9}, 10u));
-    }
-}
-
 template<typename Store, typename Inout>
 void testConvertScalar(const Store& store, const Inout& inout)
 {
@@ -362,7 +313,7 @@ void testAssignSimilar()
 
 MAIN(testdata)
 {
-    testPlan(111);
+    testPlan(108);
     testSetup();
     testTraverse();
     testAssign();
@@ -370,7 +321,6 @@ MAIN(testdata)
     testName();
     testIterStruct();
     testIterUnion();
-    testPvRequest();
 
     testConvertScalar<double, bool>(1.0, true);
     testConvertScalar<double, bool>(0.0, false);
diff --git a/test/testpvreq.cpp b/test/testpvreq.cpp
index 1774dea..df51db2 100644
--- a/test/testpvreq.cpp
+++ b/test/testpvreq.cpp
@@ -17,11 +17,60 @@
 #include <pvxs/sharedArray.h>
 #include <pvxs/client.h>
 #include <pvxs/nt.h>
-#include "utilpvt.h"
+#include "dataimpl.h"
+#include "pvrequest.h"
 
 namespace {
 using namespace pvxs;
 
+void testPvRequest()
+{
+    namespace M = members;
+
+    testDiag("%s", __func__);
+
+    auto def = nt::NTScalar{TypeCode::String}.build();
+    auto val = def.create();
+    testShow()<<val;
+
+    {
+        auto rdef = TypeDef(TypeCode::Struct, {
+                                M::Struct("field", {})
+                            });
+
+        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
+
+        testEq(mask, BitMask({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, 10u));
+    }
+
+    {
+        auto rdef = TypeDef(TypeCode::Struct, {
+                                M::Struct("field", {
+                                    M::Struct("value", {}),
+                                })
+                            });
+
+        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
+
+        testEq(mask, BitMask({0, 1}, 10u));
+    }
+
+    {
+        auto rdef = TypeDef(TypeCode::Struct, {
+                                M::Struct("field", {
+                                    M::Struct("timeStamp", {}),
+                                    M::Struct("alarm", {
+                                        M::Struct("status", {}),
+                                    }),
+                                })
+                            });
+
+        auto mask = request2mask(Value::Helper::desc(val), rdef.create());
+
+        testEq(mask, BitMask({0, 2, 4, 6, 7, 8, 9}, 10u));
+    }
+}
+
 struct TestBuilder : client::detail::CommonBuilder<TestBuilder, client::detail::PRBase>
 {
     TestBuilder()
@@ -300,9 +349,10 @@ void testArgs()
 
 MAIN(testpvreq)
 {
-    testPlan(27);
+    testPlan(30);
     testSetup();
     logger_config_env();
+    testPvRequest();
     testEmpty();
     testAssemble();
     testParseEmpty();