Changed to range because dqs was changed on the test records, test of…

… a range query too

tests/testthat/test-idig_search_media.R

@@ -1,66 +1,66 @@
-context("test idig_search_media")
-
-genus <- "cortinarius"
-rq <-list("genus"=genus)
-mq <- list("dqs"=0.25)
-fields <- c('uuid', 'dqs', 'hasSpecimen')
-
-# Basic search, full results
-df <- idig_search_media(rq=rq, limit=6000)
-expect_that(df, is_a("data.frame"))
-expect_that(nrow(df) > 5000, is_true())
-expect_that(which(df$uuid == "000113ce-84d4-467c-9fe3-13191596865e") > 0, 
-            is_true())
-df <- idig_search_media(rq=rq, mq=mq, limit=6000)
-expect_that(df, is_a("data.frame"))
-expect_that(nrow(df) > 5000, is_true())
-expect_that(which(df$uuid == "e") > 0, 
-            is_true())
-df <- idig_search_media(mq=mq, limit=6000)
-expect_that(df, is_a("data.frame"))
-expect_that(nrow(df) > 5000, is_true())
-expect_that(which(df$uuid == "e") > 0, 
-            is_true())
-
-# Limited results, custom fields
-df <- idig_search_media(mq=mq, fields=fields, limit=10)
-expect_that(nrow(df) == 10, is_true())
-expect_that(ncol(df) == length(fields), is_true())
-# Save some UUIDs for later
-second_uuid <- df[["uuid"]][[2]]
-
-if (FALSE){
-# Offset
-df <- idig_search_media(mq=mq, fields=fields, limit=1, offset=1)
-expect_that(nrow(df) == 1, is_true())
-expect_that(df[["uuid"]][[1]] == second_uuid, is_true())
-
-# Max items
-expect_that(df <- idig_search_media(rq=list("country"="united states")),
-            throws_error("max_items"))
-
-# All fields
-df <- idig_search_media(rq=rq, fields="all", limit=10)
-expect_that(ncol(df) > 50, is_true())
-
-# Dataframe w/default fields is formatted properly
-df <- idig_search_media(rq=rq, limit=1)
-for (i in 1:ncol(df)){
-  expect_that(df[[i]], is_a("character"))
-}
-
-# Empty results
-df <- idig_search_media(rq=list("uuid"="nobodyhome"))
-expect_that(nrow(df) == 0, is_true())
-
-# Geopoint and special fields
-df <- idig_search_media(rq=list("uuid"="f84faea8-82ac-4f71-b256-6b2be5d1b59d"),
-                          fields=c("uuid", "geopoint", "mediamedia", "flags",
-                          "recordids"), limit=10)
-expect_that(is.null(df[1, "geopoint.lat"]), is_false())
-expect_that(is.null(df[1, "geopoint.lat"]), is_false())
-expect_that(is.null(df[1, "flags"]), is_true())
-expect_that(is.null(df[1, "mediamedia"]), is_true())
-expect_that(is.null(df[1, "recordids"]), is_true())
-
+context("test idig_search_media")
+
+genus <- "cortinarius"
+rq <-list("genus"=genus)
+mq <- list("dqs"=list("type"="range", "gte"=0.2, "lte"=0.4))
+fields <- c('uuid', 'dqs', 'hasSpecimen')
+
+# Basic search, full results
+df <- idig_search_media(rq=rq, limit=6000)
+expect_that(df, is_a("data.frame"))
+expect_that(nrow(df) > 5000, is_true())
+expect_that(which(df$uuid == "000113ce-84d4-467c-9fe3-13191596865e") > 0, 
+            is_true())
+df <- idig_search_media(rq=rq, mq=mq, limit=6000)
+expect_that(df, is_a("data.frame"))
+expect_that(nrow(df) > 5000, is_true())
+expect_that(which(df$uuid == "e") > 0, 
+            is_true())
+df <- idig_search_media(mq=mq, limit=6000)
+expect_that(df, is_a("data.frame"))
+expect_that(nrow(df) > 5000, is_true())
+expect_that(which(df$uuid == "e") > 0, 
+            is_true())
+
+# Limited results, custom fields
+df <- idig_search_media(mq=mq, fields=fields, limit=10)
+expect_that(nrow(df) == 10, is_true())
+expect_that(ncol(df) == length(fields), is_true())
+# Save some UUIDs for later
+#second_uuid <- df[["uuid"]][[2]]
+
+if (FALSE){
+# Offset
+df <- idig_search_media(mq=mq, fields=fields, limit=1, offset=1)
+expect_that(nrow(df) == 1, is_true())
+expect_that(df[["uuid"]][[1]] == second_uuid, is_true())
+
+# Max items
+expect_that(df <- idig_search_media(rq=list("country"="united states")),
+            throws_error("max_items"))
+
+# All fields
+df <- idig_search_media(rq=rq, fields="all", limit=10)
+expect_that(ncol(df) > 50, is_true())
+
+# Dataframe w/default fields is formatted properly
+df <- idig_search_media(rq=rq, limit=1)
+for (i in 1:ncol(df)){
+  expect_that(df[[i]], is_a("character"))
+}
+
+# Empty results
+df <- idig_search_media(rq=list("uuid"="nobodyhome"))
+expect_that(nrow(df) == 0, is_true())
+
+# Geopoint and special fields
+df <- idig_search_media(rq=list("uuid"="f84faea8-82ac-4f71-b256-6b2be5d1b59d"),
+                          fields=c("uuid", "geopoint", "mediamedia", "flags",
+                          "recordids"), limit=10)
+expect_that(is.null(df[1, "geopoint.lat"]), is_false())
+expect_that(is.null(df[1, "geopoint.lat"]), is_false())
+expect_that(is.null(df[1, "flags"]), is_true())
+expect_that(is.null(df[1, "mediamedia"]), is_true())
+expect_that(is.null(df[1, "recordids"]), is_true())
+
 }