- Add a html.new() function (convenience method that does html.clear(…

…) followed by html.add()) - fix broken tests
Alipsa · Jan 14, 2021 · 532d9ee · 532d9ee
1 parent 554a1a2
commit 532d9ee
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -5,6 +5,7 @@
 export(Html)
 export(html.add)
 export(html.clear)
+export(html.new)
 export(as.character.Html)
 export(html.table)
 export(html.imgPlot)

diff --git a/README.md b/README.md
@@ -66,6 +66,8 @@ html creating methods directly. The underlying html creating methods are:
 # Version history
 
 ## 1.4
+- Add a html.new() function (convenience method that does html.clear() followed by html.add())
+- fix broken tests
 
 ## 1.3
 - use a dedicated env to avoid accidental overwrites

diff --git a/src/main/R/Html.R b/src/main/R/Html.R
@@ -121,6 +121,11 @@ html.clear <- function() {
   .htmlcreatorEnv$html <- Html$new()
 }
 
+html.new <- function(x, ...) {
+  html.clear()
+  html.add(x, ...)
+}
+
 setMethod('as.vector', signature("Html"),
   function(x) {
     x$getContent()

diff --git a/src/test/R/HtmlcontentTest.R b/src/test/R/HtmlcontentTest.R
@@ -44,19 +44,16 @@ test.dataFrameToTable <- function() {
 }
 
 test.plotToImage <- function() {
-  html.clear()
-  html.add("<html><body>")
-  html.add(
+  html.new(
     barplot,
     table(mtcars$vs, mtcars$gear),
     main="Car Distribution by Gears and VS",
     col=c("darkblue","red")
   )
-  html.add("</html></body>")
-  #outFile <- tempfile("plot", fileext = ".html")
-  #write(html$getContent(), outFile)
+  outFile <- paste0(getwd(), "test.plotToImage.html")
+  write(html.content(), outFile)
   #print(paste("Wrote", outFile))
-  assertThat(nchar(html.content()), equalTo(5754))
+  assertThat(nchar(html.content()), equalTo(12356))
 }
 
 test.imgUrl <- function() {
@@ -67,14 +64,13 @@ test.imgUrl <- function() {
 
 test.matrix <- function() {
   html.clear()
-  html.add("<html><body>")
   html.add("<h2>PlantGrowth weight</h2>")
   html.add(
     hist,
     PlantGrowth$weight
   )
   html.add(format(summary(PlantGrowth)))
-
-  html.add("</body></html>")
-  assertThat(nchar(html.content()), equalTo(7059))
+  outFile <- paste0(getwd(), "test.matrix.html")
+  write(html.content(), outFile)
+  assertThat(nchar(html.content()), equalTo(12409))
 }