From f02f68292d69bfa5f5b4a2875b11fe3f2171bfb3 Mon Sep 17 00:00:00 2001
From: George G Vega Yon <g.vegayon@gmail.com>
Date: Sun, 8 Aug 2021 13:29:42 -0700
Subject: [PATCH] Moving files around

---
 DESCRIPTION                                      | 7 +++----
 docker/Dockerfile                                | 7 +++----
 docker/Makefile                                  | 6 ++----
 tests/rundemos.R => inst/tinytest/rundemos.R.old | 0
 {tests/testthat => inst/tinytest}/test-bugs.r    | 0
 {tests/testthat => inst/tinytest}/test-igraph.r  | 0
 {tests/testthat => inst/tinytest}/test-rgexf.r   | 0
 inst/tinytest/test_rgexf.R                       | 4 ++++
 tests/testthat.R                                 | 4 ----
 tests/testthat/test-examples.r                   | 3 ---
 tests/tinytest.R                                 | 5 +++++
 11 files changed, 17 insertions(+), 19 deletions(-)
 rename tests/rundemos.R => inst/tinytest/rundemos.R.old (100%)
 rename {tests/testthat => inst/tinytest}/test-bugs.r (100%)
 rename {tests/testthat => inst/tinytest}/test-igraph.r (100%)
 rename {tests/testthat => inst/tinytest}/test-rgexf.r (100%)
 create mode 100644 inst/tinytest/test_rgexf.R
 delete mode 100644 tests/testthat.R
 delete mode 100644 tests/testthat/test-examples.r
 create mode 100644 tests/tinytest.R

diff --git a/DESCRIPTION b/DESCRIPTION
index a801047..bb44e2a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -23,7 +23,7 @@ Description: Create, read and write 'GEXF' (Graph Exchange 'XML' Format) graph
     'javascript' library) and interact with the 'igraph' package.
 URL: https://gvegayon.github.io/rgexf
 BugReports: http://github.com/gvegayon/rgexf/issues
-Imports:
+Imports: 
     XML,
     igraph,
     grDevices,
@@ -34,8 +34,7 @@ LazyLoad: yes
 RoxygenNote: 7.0.2
 Suggests: knitr,
     rmarkdown,
-    testthat,
-    covr
+    tinytest,
+    covr, tinytest
 VignetteBuilder: knitr
 Roxygen: list(markdown = TRUE)
-
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bbdf77e..1261f01 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,11 +2,10 @@ FROM rocker/r-base:latest
 
 RUN apt-get update && \
 	apt-get install -y --no-install-recommends \
-	r-cran-ape r-cran-coda r-cran-mass r-cran-rmarkdown r-cran-knitr \
-	r-cran-xml2 r-cran-covr r-cran-tinytest && \
-	Rscript -e 'utils::install.packages("fmcmc")'
+	r-cran-xml r-cran-igraph r-cran-rmarkdown r-cran-knitr \
+	r-cran-covr r-cran-tinytest
 
-RUN Rscript -e 'utils::install.packages("AUC")'
+RUN Rscript -e 'utils::install.packages("servr")'
 
 CMD ["bash"]
 
diff --git a/docker/Makefile b/docker/Makefile
index e3af96e..cdb8424 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,6 +1,4 @@
 build:
-	docker build -t uscbiostats/aphylo:release -f Dockerfile . && \
-		docker build -t uscbiostats/aphylo:devel -f Dockerfile.dev .
+	docker build -t gvegayon/rgexf:release -f Dockerfile . 
 push: build
-	docker push uscbiostats/aphylo:release && \
-		docker push uscbiostats/aphylo:devel
+	docker push gvegayon/rgexf:release 
diff --git a/tests/rundemos.R b/inst/tinytest/rundemos.R.old
similarity index 100%
rename from tests/rundemos.R
rename to inst/tinytest/rundemos.R.old
diff --git a/tests/testthat/test-bugs.r b/inst/tinytest/test-bugs.r
similarity index 100%
rename from tests/testthat/test-bugs.r
rename to inst/tinytest/test-bugs.r
diff --git a/tests/testthat/test-igraph.r b/inst/tinytest/test-igraph.r
similarity index 100%
rename from tests/testthat/test-igraph.r
rename to inst/tinytest/test-igraph.r
diff --git a/tests/testthat/test-rgexf.r b/inst/tinytest/test-rgexf.r
similarity index 100%
rename from tests/testthat/test-rgexf.r
rename to inst/tinytest/test-rgexf.r
diff --git a/inst/tinytest/test_rgexf.R b/inst/tinytest/test_rgexf.R
new file mode 100644
index 0000000..aa3f72e
--- /dev/null
+++ b/inst/tinytest/test_rgexf.R
@@ -0,0 +1,4 @@
+
+# Placeholder with simple test
+expect_equal(1 + 1, 2)
+
diff --git a/tests/testthat.R b/tests/testthat.R
deleted file mode 100644
index 46b8fd6..0000000
--- a/tests/testthat.R
+++ /dev/null
@@ -1,4 +0,0 @@
-library(testthat)
-library(rgexf)
-
-test_check("rgexf")
diff --git a/tests/testthat/test-examples.r b/tests/testthat/test-examples.r
deleted file mode 100644
index 8e6a858..0000000
--- a/tests/testthat/test-examples.r
+++ /dev/null
@@ -1,3 +0,0 @@
-# context("Examples")
-# 
-# test_examples()
diff --git a/tests/tinytest.R b/tests/tinytest.R
new file mode 100644
index 0000000..b8188db
--- /dev/null
+++ b/tests/tinytest.R
@@ -0,0 +1,5 @@
+
+if ( requireNamespace("tinytest", quietly=TRUE) ){
+  tinytest::test_package("rgexf")
+}
+