Fixing merge conflicts

Merge branch 'FixingTests' into dev # Conflicts: # DESCRIPTION # tests/testthat/test-JPSD2F.R # tests/testthat/test-One_Sample.R # tests/testthat/test-RSSDF.R # tests/testthat/test-RSSNRF.R # tests/testthat/test-rss_sample.R # tests/testthat/test-sbs_pps_estimate.R # tests/testthat/test-sbs_pps_sample.R
biometryhub · May 23, 2024 · 40a834e · 40a834e
2 parents b782b4a + 423924f
commit 40a834e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -21,6 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -22,12 +22,12 @@ URL: https://biometryhub.github.io/RankedSetSampling/
 BugReports: https://github.com/biometryhub/RankedSetSampling/issues
 Depends:
     R (>= 3.5.0)
-Imports:
+Imports: 
     Rcpp,
     ggplot2,
     SDaA,
     FNN
-Suggests:
+Suggests: 
     covr,
     testthat,
     parallel

diff --git a/tests/testthat/test-rss_sample.R b/tests/testthat/test-rss_sample.R
@@ -1,5 +1,4 @@
 test_that("RSS has a correct output.", {
-  skip_if(getRversion() < "3.4")
   matrix_ <- matrix(1:200, ncol = 2)
 
   rss_matrix_w_replacement <- rss_sample(matrix_, 100, 10, 2, TRUE)

diff --git a/tests/testthat/test-sbs_pps_estimate.R b/tests/testthat/test-sbs_pps_estimate.R
@@ -1,5 +1,4 @@
 test_that("An SBS PPS estimator works.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
   load("../expected_sbs_pps_estimate.RData")
 
@@ -16,7 +15,6 @@ test_that("An SBS PPS estimator works.", {
 })
 
 test_that("An SBS PPS estimator works for PPS only.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
   load("../expected_pps_estimate.RData")
 
@@ -33,7 +31,6 @@ test_that("An SBS PPS estimator works for PPS only.", {
 })
 
 test_that("An SBS PPS estimator works for SBS only.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
   load("../expected_sbs_estimate.RData")
 

diff --git a/tests/testthat/test-sbs_pps_sample.R b/tests/testthat/test-sbs_pps_sample.R
@@ -1,5 +1,4 @@
 test_that("An SBS PPS sample works.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
 
   n_sbs <- 20
@@ -20,7 +19,6 @@ test_that("An SBS PPS sample works.", {
 })
 
 test_that("An SBS PPS sample works for PPS only.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
 
   n_sbs <- 0
@@ -33,7 +31,6 @@ test_that("An SBS PPS sample works for PPS only.", {
 })
 
 test_that("An SBS PPS sample works for SBS only.", {
-  skip_if(getRversion() < "3.4")
   load("../sbs_pps_input.RData")
 
   n_sbs <- 20