Reorganizing tests

tests/testthat/test-greedyPopMix.R

@@ -1,14 +1,17 @@
 context("greedyPopMix functions")
 
 test_that("Auxiliary functions work properly", {
+  # Testing findOutRowsFromInd -------------------------------------------------
   x <- matrix(11:16, 3)
   y <- matrix(2:7, 3)
   z <- list(
     popnames2 = matrix(c(11:13, seq(1.5, 2.5, 0.5)), 3),
     rowsFromInd = 2
   )
-  x2 <- matrix(seq(4, 14, 2), 3)
   expect_equal(findOutRowsFromInd(x, y, "Diploid"), z)
+
+  # Testing getPopDistancesByKL ------------------------------------------------
+  x2 <- matrix(seq(4, 14, 2), 3)
   expect_equal(
     getPopDistancesByKL(x2),
     list(
@@ -16,14 +19,16 @@ test_that("Auxiliary functions work properly", {
       distances = as.matrix(rep(0, 4950))
     )
   )
+
+  # Testing handlePopData ------------------------------------------------------
   x3 <- matrix(c(9, 4, 1, 8, 5, 2, 1, 2, 3), 3)
   y3 <- list(
-    newData = matrix(c(3:1, 3:1, 1:3), 3),
-    rows = matrix(c(1:3, 1:3), 3),
+    newData     = matrix(c(3: 1, 3: 1, 1: 3), 3),
+    rows        = matrix(c(1: 3, 1: 3), 3),
     alleleCodes = matrix(c(1, 4, 9, 2, 5, 8), 3),
-    noalle = c(3, 3),
-    adjprior = matrix(rep(3/9, 6), 3),
-    priorTerm = 5.9125
+    noalle      = c(3, 3),
+    adjprior    = matrix(rep(3/9, 6), 3),
+    priorTerm   = 5.9125
   )
   expect_equal(handlePopData(x3), y3)
 })