[ARVADOS] updated: 1.1.2-213-g7471c3f

[Git user]

Summary of changes:
 sdk/R/tests/testthat/test-Collection.R    |  2 +-
 sdk/R/tests/testthat/test-Subcollection.R | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

       via  7471c3fb9752482dccae508c34874f9b3c77dfb1 (commit)
       via  0b869f3fab26c33515cd9b2f44e0ed9c8c542698 (commit)
      from  0488e81c85948faa6a14ca437d9e594d91bcbbd8 (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 7471c3fb9752482dccae508c34874f9b3c77dfb1
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Fri Jan 26 16:09:31 2018 +0100

    Updated unit test name to reflect changes made to getFileListing method
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/tests/testthat/test-Collection.R b/sdk/R/tests/testthat/test-Collection.R
index af03748..0c45958 100644
--- a/sdk/R/tests/testthat/test-Collection.R
+++ b/sdk/R/tests/testthat/test-Collection.R
@@ -219,7 +219,7 @@ test_that("move raises exception if new location is not valid", {
                              fixed = TRUE))
 })
 
-test_that("getFileListing returns collection content received from REST service", {
+test_that("getFileListing returns sorted collection content received from REST service", {
 
     collectionContent <- c("animal",
                            "animal/fish",

commit 0b869f3fab26c33515cd9b2f44e0ed9c8c542698
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Fri Jan 26 16:04:32 2018 +0100

    Updated test to reflect changes to getFileListing method
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/tests/testthat/test-Subcollection.R b/sdk/R/tests/testthat/test-Subcollection.R
index 401b086..b155ed4 100644
--- a/sdk/R/tests/testthat/test-Subcollection.R
+++ b/sdk/R/tests/testthat/test-Subcollection.R
@@ -13,7 +13,7 @@ test_that("getRelativePath returns path relative to the tree root", {
     expect_that(fish$getRelativePath(), equals("animal/fish"))
 }) 
 
-test_that(paste("getFileListing by default returns path of all files",
+test_that(paste("getFileListing by default returns sorted path of all files",
                 "relative to the current subcollection"), {
 
     animal   <- Subcollection$new("animal")
@@ -26,7 +26,9 @@ test_that(paste("getFileListing by default returns path of all files",
     fish$add(blueFish)
 
     result <- animal$getFileListing()
-    expectedResult <- c("animal/fish/shark", "animal/fish/blueFish")
+
+    #expect sorted array
+    expectedResult <- c("animal/fish/blueFish", "animal/fish/shark")
 
     resultsMatch <- length(expectedResult) == length(result) &&
                     all(expectedResult == result)
@@ -34,7 +36,7 @@ test_that(paste("getFileListing by default returns path of all files",
     expect_that(resultsMatch, is_true())
 }) 
 
-test_that(paste("getFileListing returns names of all direct children",
+test_that(paste("getFileListing returns sorted names of all direct children",
                 "if fullPath is set to FALSE"), {
 
     animal <- Subcollection$new("animal")
@@ -47,7 +49,7 @@ test_that(paste("getFileListing returns names of all direct children",
     fish$add(shark)
 
     result <- animal$getFileListing(fullPath = FALSE)
-    expectedResult <- c("fish", "dog")
+    expectedResult <- c("dog", "fish")
 
     resultsMatch <- length(expectedResult) == length(result) &&
                     all(expectedResult == result)

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


hooks/post-receive
--