Merge branch 'opensdmx:master' into master

opensdmx · Dec 12, 2024 · ece5b00 · ece5b00
2 parents 34a2cc4 + bf9e0e8
commit ece5b00
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rsdmx
 Version: 0.6-4
-Date: 2024-09-13
+Date: 2024-12-12
 Title: Tools for Reading SDMX Data and Metadata
 Authors@R: c(
   person("Emmanuel", "Blondel", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-5870-5762")),

diff --git a/tests/testthat/test_Concepts.R b/tests/testthat/test_Concepts.R
@@ -16,7 +16,7 @@ test_that("Concepts 2.0 - with Concepts (backward compatibility with 1.0)",{
 
   df <- as.data.frame(concepts)
   expect_is(df, "data.frame")
-  expect_equal(colnames(df), c("id", "version","en"))
+  expect_equal(colnames(df), c("id", "version","Name.en"))
   expect_equal(nrow(df), 15L)
 })
 
@@ -30,7 +30,7 @@ test_that("Concepts - 2.0 - with ConceptSchemes",{
 
   df <- as.data.frame(concepts)
   expect_is(df, "data.frame")
-  expect_equal(colnames(df), c("id", "urn","en"))
+  expect_equal(colnames(df), c("id", "urn","Name.en"))
   expect_equal(nrow(df), 15L)
 })
 
@@ -44,6 +44,6 @@ test_that("Concepts - 2.1 - with ConceptSchemes",{
 
   df <- as.data.frame(concepts)
   expect_is(df, "data.frame")
-  expect_equal(colnames(df), c("id", "urn","en"))
+  expect_equal(colnames(df), c("id", "urn","Name.en"))
   expect_equal(nrow(df), 15L)
 })
diff --git a/tests/testthat/test_Main_Helpers.R b/tests/testthat/test_Main_Helpers.R
@@ -295,26 +295,27 @@ test_that("UNSD - data",{
 
 #ILO_Legacy (UN-ILO)
 #------------
-
-#-> datastructure
-test_that("ILO - datastructure",{
-  testthat::skip_on_cran()
-  sdmx <- readSDMX(providerId = "ILO_Legacy", resource = "datastructure", resourceId = "YI_ALB_EAP_TEAP_SEX_AGE_NB")
-  if(!is.null(sdmx)){
-    expect_is(sdmx, "SDMXDataStructureDefinition")
-  }
-})
-
-#-> data
-test_that("ILO - data",{
-  testthat::skip_on_cran()
-  sdmx <- readSDMX(providerId = "ILO_Legacy", resource = "data",
-                   flowRef = "DF_CPI_FRA_CPI_TCPI_COI_RT", key = "ALL", key.mode = "SDMX",
-                   start = "2010-01-01", end = "2014-12-31")
-  if(!is.null(sdmx)){
-    expect_is(sdmx, "SDMXGenericData")
-  }
-})
+#gives Unauthorized 403 status codes now
+
+# #-> datastructure
+# test_that("ILO - datastructure",{
+#   testthat::skip_on_cran()
+#   sdmx <- readSDMX(providerId = "ILO_Legacy", resource = "datastructure", resourceId = "YI_ALB_EAP_TEAP_SEX_AGE_NB")
+#   if(!is.null(sdmx)){
+#     expect_is(sdmx, "SDMXDataStructureDefinition")
+#   }
+# })
+# 
+# #-> data
+# test_that("ILO - data",{
+#   testthat::skip_on_cran()
+#   sdmx <- readSDMX(providerId = "ILO_Legacy", resource = "data",
+#                    flowRef = "DF_CPI_FRA_CPI_TCPI_COI_RT", key = "ALL", key.mode = "SDMX",
+#                    start = "2010-01-01", end = "2014-12-31")
+#   if(!is.null(sdmx)){
+#     expect_is(sdmx, "SDMXGenericData")
+#   }
+# })
 
 #ILO (UN-ILO)
 #------------