[ARVADOS] updated: 1.1.2-195-g3a6a891

[Git user]

Summary of changes:
 sdk/R/R/util.R                          |  15 ++---
 sdk/R/tests/testthat/test-HttpRequest.R |  21 +++++++
 services/fuse/arvados_fuse/fusedir.py   | 105 +++++++++++++++++---------------
 3 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100644 sdk/R/tests/testthat/test-HttpRequest.R

       via  3a6a89199e2478454905731ccef0868d5fdd6f8f (commit)
       via  5358498e3f2c0dd73231dca8ca82f9ad164854f7 (commit)
       via  ae35f42f7026faa85894b0a8c90caec87c6af239 (commit)
       via  1809dbb21b4cb65e0e141dd41d41a3516ef33ec5 (commit)
       via  0dcf9daff8fce376f20f125c3ef867333976c18c (commit)
      from  3f5268c5a8d6a72597a05bba5dd6e0e5e67457a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3a6a89199e2478454905731ccef0868d5fdd6f8f
Merge: 5358498 ae35f42
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Jan 24 16:19:01 2018 +0100

    Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>


commit 5358498e3f2c0dd73231dca8ca82f9ad164854f7
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Jan 24 16:17:36 2018 +0100

    Added unit tests for HttpRequest class.
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/R/util.R b/sdk/R/R/util.R
index f6a582f..65b5a4e 100644
--- a/sdk/R/R/util.R
+++ b/sdk/R/R/util.R
@@ -14,22 +14,23 @@ trimFromEnd <- function(sample, trimCharacters)
     sample
 }
 
-RListToPythonList <- function(sample, separator = ", ")
+RListToPythonList <- function(RList, separator = ", ")
 {
-    pythonArrayContent <- sapply(sample, function(sampleUnit)
+    pythonArrayContent <- sapply(RList, function(elementInList)
     {
-        if((is.vector(sampleUnit) || is.list(sampleUnit)) &&
-            length(sampleUnit) > 1)
+        if((is.vector(elementInList) || is.list(elementInList)) &&
+            length(elementInList) > 1)
         {
-            return(RListToPythonList(sampleUnit, separator))
+            return(RListToPythonList(elementInList, separator))
         }
         else
         {
-            return(paste0("\"", sampleUnit, "\""))
+            return(paste0("\"", elementInList, "\""))
         }
     })
 
-    return(paste0("[", paste0(pythonArrayContent, collapse = separator), "]"))
+    pythonArray <- paste0("[", paste0(pythonArrayContent, collapse = separator), "]")
+    pythonArray
 }
 
 appendToStartIfNotExist <- function(sample, characters)
diff --git a/sdk/R/tests/testthat/test-HttpRequest.R b/sdk/R/tests/testthat/test-HttpRequest.R
new file mode 100644
index 0000000..427ec34
--- /dev/null
+++ b/sdk/R/tests/testthat/test-HttpRequest.R
@@ -0,0 +1,21 @@
+context("Http Parser")
+
+
+test_that(paste("createQuery generates and encodes query portion of http",
+                "request based on filters, limit and offset parameters"), {
+
+    http <- HttpRequest$new()
+    filters <- list(list("color", "=", "red"))
+    limit <- 20
+    offset <- 50
+    expect_that(http$createQuery(filters, limit, offset),
+                equals(paste0("/?filters=%5B%5B%22color%22%2C%22%3D%22%2C%22red",
+                              "%22%5D%5D&limit=20&offset=50")))
+}) 
+
+test_that(paste("createQuery generates and empty string",
+                "when filters, limit and offset parameters are set to NULL"), {
+
+    http <- HttpRequest$new()
+    expect_that(http$createQuery(NULL, NULL, NULL), equals(""))
+}) 

-----------------------------------------------------------------------


hooks/post-receive
--