From 927d3de33554331390e83c5d0e7e412a2de0f3c8 Mon Sep 17 00:00:00 2001
From: Lum <klum@labkey.com>
Date: Thu, 22 Jan 2026 13:40:44 -0800
Subject: [PATCH 1/3] Rlabkey test for makeFilter

---
 data/api/rlabkey-api-query.xml | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/data/api/rlabkey-api-query.xml b/data/api/rlabkey-api-query.xml
index b70c50f484..452e0c11af 100644
--- a/data/api/rlabkey-api-query.xml
+++ b/data/api/rlabkey-api-query.xml
@@ -625,4 +625,47 @@
             ]]>
         </response>
     </test>
+    <test name="make filters" type="post">
+        <url>
+            <![CDATA[
+                library(Rlabkey)
+                makeFilter(
+                    c("foo/Reagent", "CONTAINS", "this or that"),
+                    c("Temp_C", "GREATER_THAN", "12"),
+                    c("SystolicBloodPressure", "MISSING", ""))
+            ]]>
+        </url>
+        <response>
+            <![CDATA[
+                [1] "query.foo%2FReagent~contains=this%20or%20that"
+                [2] "query.Temp_C~gt=12"
+                [3] "query.SystolicBloodPressure~isblank="
+            ]]>
+        </response>
+    </test>
+<!--
+    Uncomment when Rlabkey 3.4.5 is available
+    <test name="make filters as list" type="post">
+        <url>
+            <![CDATA[
+                library(Rlabkey)
+                makeFilter(
+                    c("foo/Reagent", "CONTAINS", "this or that"),
+                    c("Temp_C", "GREATER_THAN", "12"),
+                    c("SystolicBloodPressure", "MISSING", ""), asList=TRUE)
+            ]]>
+        </url>
+        <response>
+            <![CDATA[
+                $`query.foo/Reagent~contains`
+                [1] "this or that"
+
+                $`query.Temp_C~gt`
+                [1] "12"
+
+                $`query.SystolicBloodPressure~isblank`
+                [1] ""
+            ]]>
+        </response>
+    </test>-->
 </ApiTests>

From b6f8746a3a815f3397dc8181a94f7a10f2cdba11 Mon Sep 17 00:00:00 2001
From: Lum <klum@labkey.com>
Date: Thu, 22 Jan 2026 14:59:36 -0800
Subject: [PATCH 2/3] Include additional parameter

---
 data/api/rlabkey-api.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/api/rlabkey-api.xml b/data/api/rlabkey-api.xml
index a5f9753ac1..d038f02913 100644
--- a/data/api/rlabkey-api.xml
+++ b/data/api/rlabkey-api.xml
@@ -30,7 +30,7 @@
         <url>
             <![CDATA[
                 library(Rlabkey)
-                print(labkey.getFolders(labkey.url.base, "/%projectName%", includeEffectivePermissions=FALSE))
+                print(labkey.getFolders(labkey.url.base, "/%projectName%", includeEffectivePermissions=FALSE, includeSubfolders=TRUE))
             ]]>
         </url>
         <response>

From 3300f6681395575262a0dbbaeba5091e62829a83 Mon Sep 17 00:00:00 2001
From: Lum <klum@labkey.com>
Date: Tue, 27 Jan 2026 16:14:39 -0800
Subject: [PATCH 3/3] Fix parsing problem, enable API test.

---
 data/api/rlabkey-api-query.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/api/rlabkey-api-query.xml b/data/api/rlabkey-api-query.xml
index 452e0c11af..acfe2b2ef4 100644
--- a/data/api/rlabkey-api-query.xml
+++ b/data/api/rlabkey-api-query.xml
@@ -643,8 +643,6 @@
             ]]>
         </response>
     </test>
-<!--
-    Uncomment when Rlabkey 3.4.5 is available
     <test name="make filters as list" type="post">
         <url>
             <![CDATA[
@@ -667,5 +665,5 @@
                 [1] ""
             ]]>
         </response>
-    </test>-->
+    </test>
 </ApiTests>