[rkward-cvs] [rkward] packages/XiMpLe: relocated unit tests here also; rebuilt the docs

m.eik michalke meik.michalke at uni-duesseldorf.de
Sun Dec 14 22:37:10 UTC 2014 

Git commit ee32c604b26a8fd165af658d8c73e8368938c773 by m.eik michalke.
Committed on 14/12/2014 at 22:35.
Pushed by meikm into branch 'master'.

relocated unit tests here also; rebuilt the docs

M  +4    -0    packages/XiMpLe/ChangeLog
M  +2    -2    packages/XiMpLe/DESCRIPTION
M  +4    -1    packages/XiMpLe/R/01_method_01_pasteXML.R
M  +2    -2    packages/XiMpLe/R/XiMpLe-package.R
M  +2    -2    packages/XiMpLe/inst/CITATION
M  +7    -0    packages/XiMpLe/inst/NEWS.Rd
M  +-    --    packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
M  +1    -2    packages/XiMpLe/man/XMLGetters-methods.Rd
M  +1    -2    packages/XiMpLe/man/XMLTree.Rd
M  +2    -2    packages/XiMpLe/man/XiMpLe-package.Rd
M  +1    -2    packages/XiMpLe/man/node.Rd
R  +2    -2    packages/XiMpLe/tests/testthat.R [from: packages/XiMpLe/tests/test_XiMpLe_package.R - 055% similarity]
R  +0    -0    packages/XiMpLe/tests/testthat/koRpus_RSS_sample.xml [from: packages/XiMpLe/inst/tests/koRpus_RSS_sample.xml - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_RSS_parsed.RData [from: packages/XiMpLe/inst/tests/sample_RSS_parsed.RData - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_XML_node_attrs.RData [from: packages/XiMpLe/inst/tests/sample_XML_node_attrs.RData - 100% similarity]
R  +0    -0    packages/XiMpLe/tests/testthat/sample_XML_node_closed_dput.txt [from: packages/XiMpLe/inst/tests/sample_XML_node_closed_dput.txt - 100% similarity]
R  +0    -0    packages/XiMpLe/tests/testthat/sample_XML_node_empty_dput.txt [from: packages/XiMpLe/inst/tests/sample_XML_node_empty_dput.txt - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_XML_node_extracted.RData [from: packages/XiMpLe/inst/tests/sample_XML_node_extracted.RData - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_XML_tree.RData [from: packages/XiMpLe/inst/tests/sample_XML_tree.RData - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_XML_tree_changed.RData [from: packages/XiMpLe/inst/tests/sample_XML_tree_changed.RData - 100% similarity]
R  +-    --    packages/XiMpLe/tests/testthat/sample_XML_tree_changed_value.RData [from: packages/XiMpLe/inst/tests/sample_XML_tree_changed_value.RData - 100% similarity]
R  +0    -0    packages/XiMpLe/tests/testthat/tests.R [from: packages/XiMpLe/inst/tests/tests.R - 100% similarity]

http://commits.kde.org/rkward/ee32c604b26a8fd165af658d8c73e8368938c773

diff --git a/packages/XiMpLe/ChangeLog b/packages/XiMpLe/ChangeLog
index 4e084d0..8fb844e 100644
--- a/packages/XiMpLe/ChangeLog
+++ b/packages/XiMpLe/ChangeLog
@@ -1,5 +1,9 @@
 ChangeLog for package XiMpLe
 
+changes in version 0.03-23 (2014-12-14)
+changed:
+  - relocated the unit tests to tests/testthat
+
 changes in version 0.03-22 (2014-12-02)
 fixed:
   - added curly brackets to the function bodies of all setGeneric() calls to
diff --git a/packages/XiMpLe/DESCRIPTION b/packages/XiMpLe/DESCRIPTION
index 54704d5..6f31215 100644
--- a/packages/XiMpLe/DESCRIPTION
+++ b/packages/XiMpLe/DESCRIPTION
@@ -21,8 +21,8 @@ LazyLoad: yes
 URL: http://reaktanz.de/?c=hacking&s=XiMpLe
 Authors at R: c(person(given="Meik", family="Michalke",
     email="meik.michalke at hhu.de", role=c("aut", "cre")))
-Version: 0.03-22
-Date: 2014-12-02
+Version: 0.03-23
+Date: 2014-12-14
 Collate:
     '00_class_01_XiMpLe.node.R'
     '00_class_02_XiMpLe.doc.R'
diff --git a/packages/XiMpLe/R/01_method_01_pasteXML.R b/packages/XiMpLe/R/01_method_01_pasteXML.R
index 9707f3f..2ea4677 100644
--- a/packages/XiMpLe/R/01_method_01_pasteXML.R
+++ b/packages/XiMpLe/R/01_method_01_pasteXML.R
@@ -34,12 +34,15 @@
 #' @seealso \code{\link[XiMpLe:XiMpLe.node-class]{XiMpLe.node}}, 
 #'    \code{\link[XiMpLe:XiMpLe.doc-class]{XiMpLe.doc}}
 #' @keywords methods
+#' @import methods
 #' @rdname pasteXML-methods
 #' @include 00_class_01_XiMpLe.node.R
 #' @include 00_class_02_XiMpLe.doc.R
 #' @docType methods
 #' @export
-setGeneric("pasteXML", function(obj, ...){standardGeneric("pasteXML")})
+setGeneric("pasteXML", function(obj, ...){
+  standardGeneric("pasteXML")
+})
 
 #' @param level Indentation level.
 #' @param shine Integer, controlling if the output should be formatted for better readability. Possible values:
diff --git a/packages/XiMpLe/R/XiMpLe-package.R b/packages/XiMpLe/R/XiMpLe-package.R
index c94a43a..18109f6 100644
--- a/packages/XiMpLe/R/XiMpLe-package.R
+++ b/packages/XiMpLe/R/XiMpLe-package.R
@@ -3,8 +3,8 @@
 #' \tabular{ll}{
 #' Package: \tab XiMpLe\cr
 #' Type: \tab Package\cr
-#' Version: \tab 0.03-22\cr
-#' Date: \tab 2014-12-02\cr
+#' Version: \tab 0.03-23\cr
+#' Date: \tab 2014-12-14\cr
 #' Depends: \tab R (>= 2.9.0),methods\cr
 #' Enhances: \tab rkward\cr
 #' Encoding: \tab UTF-8\cr
diff --git a/packages/XiMpLe/inst/CITATION b/packages/XiMpLe/inst/CITATION
index eedf333..3f048fa 100644
--- a/packages/XiMpLe/inst/CITATION
+++ b/packages/XiMpLe/inst/CITATION
@@ -2,12 +2,12 @@ bibentry("Manual",
     title="XiMpLe: A simple XML tree parser and generator",
     author="Meik Michalke",
     year="2014",
-    note="(Version 0.03-22)",
+    note="(Version 0.03-23)",
     url="http://reaktanz.de/?c=hacking&s=XiMpLe",
 
     textVersion =
     paste("Michalke, M. (2014). ",
-        "XiMpLe: A simple XML tree parser and generator (Version 0.03-22). ",
+        "XiMpLe: A simple XML tree parser and generator (Version 0.03-23). ",
         "Available from http://reaktanz.de/?c=hacking&s=XiMpLe",
         sep=""),
 
diff --git a/packages/XiMpLe/inst/NEWS.Rd b/packages/XiMpLe/inst/NEWS.Rd
index cb0a8a8..c7b76b2 100644
--- a/packages/XiMpLe/inst/NEWS.Rd
+++ b/packages/XiMpLe/inst/NEWS.Rd
@@ -1,6 +1,13 @@
 \name{NEWS}
 \title{News for Package 'XiMpLe'}
 \encoding{UTF-8}
+\section{Changes in XiMpLe version 0.03-23 (2014-12-14)}{
+  \subsection{changed}{
+    \itemize{
+      \item relocated the unit tests to tests/testthat
+    }
+  }
+}
 \section{Changes in XiMpLe version 0.03-22 (2014-12-02)}{
   \subsection{fixed}{
     \itemize{
diff --git a/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf b/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
index 776bd54..0cb8d60 100644
Binary files a/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf and b/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf differ
diff --git a/packages/XiMpLe/man/XMLGetters-methods.Rd b/packages/XiMpLe/man/XMLGetters-methods.Rd
index e8cb794..633f3e9 100644
--- a/packages/XiMpLe/man/XMLGetters-methods.Rd
+++ b/packages/XiMpLe/man/XMLGetters-methods.Rd
@@ -182,8 +182,7 @@ Another special method can scan a node/document tree object for appearances of n
 }
 
 Finally,
-      there is a method to scan for certain values in XiMpLe objects and just list them. For instance,
-      it can be used to
+      there is a method to scan for certain values in XiMpLe objects and just list them. For instance, it can be used to
 list all instances of a certain attribute type in a document tree:
 
 \itemize{
diff --git a/packages/XiMpLe/man/XMLTree.Rd b/packages/XiMpLe/man/XMLTree.Rd
index ad47f9e..118348f 100644
--- a/packages/XiMpLe/man/XMLTree.Rd
+++ b/packages/XiMpLe/man/XMLTree.Rd
@@ -17,8 +17,7 @@ which are treated as simple text values.}
       no checking is done.}
 
 \item{dtd}{A named list,
-      doctype definition of the XML tree. Valid elements are \code{doctype} (root element),
-      \code{decl}
+      doctype definition of the XML tree. Valid elements are \code{doctype} (root element), \code{decl}
 ("PUBLIC" or "SYSTEM"), \code{id} (the identifier) and \code{refer} (URI to .dtd).
    Currently just pasted, no checking is done.}
 
diff --git a/packages/XiMpLe/man/XiMpLe-package.Rd b/packages/XiMpLe/man/XiMpLe-package.Rd
index 7654f4c..89db86a 100644
--- a/packages/XiMpLe/man/XiMpLe-package.Rd
+++ b/packages/XiMpLe/man/XiMpLe-package.Rd
@@ -10,8 +10,8 @@ A simple XML tree parser and generator.
 \tabular{ll}{
 Package: \tab XiMpLe\cr
 Type: \tab Package\cr
-Version: \tab 0.03-22\cr
-Date: \tab 2014-12-02\cr
+Version: \tab 0.03-23\cr
+Date: \tab 2014-12-14\cr
 Depends: \tab R (>= 2.9.0),methods\cr
 Enhances: \tab rkward\cr
 Encoding: \tab UTF-8\cr
diff --git a/packages/XiMpLe/man/node.Rd b/packages/XiMpLe/man/node.Rd
index 6547f53..663a81f 100644
--- a/packages/XiMpLe/man/node.Rd
+++ b/packages/XiMpLe/man/node.Rd
@@ -33,8 +33,7 @@ node(obj, node = list(), what = NULL, cond.attr = NULL,
 the child of its previous element. duplicate matches will be returned as a list.}
 
 \item{what}{A character string,
-      must be a valid slot name of class \code{\link[XiMpLe:XiMpLe.node-class]{XiMpLe.node}},
-      like
+      must be a valid slot name of class \code{\link[XiMpLe:XiMpLe.node-class]{XiMpLe.node}}, like
 \code{"attributes"} or \code{"value"}. If not \code{NULL},
       only that part of a node will be returned.
 There's also two special properties for this option: \code{what="@path"} will not return the
diff --git a/packages/XiMpLe/tests/test_XiMpLe_package.R b/packages/XiMpLe/tests/testthat.R
similarity index 55%
rename from packages/XiMpLe/tests/test_XiMpLe_package.R
rename to packages/XiMpLe/tests/testthat.R
index 3b0109a..02cebf3 100644
--- a/packages/XiMpLe/tests/test_XiMpLe_package.R
+++ b/packages/XiMpLe/tests/testthat.R
@@ -1,5 +1,5 @@
 # the tests are realized using the "testthat" package
-# and can be found in ../inst/tests
+# and can be found in ./testthat
 
 require(testthat)
-test_package("XiMpLe")
+test_check("XiMpLe")
diff --git a/packages/XiMpLe/inst/tests/koRpus_RSS_sample.xml b/packages/XiMpLe/tests/testthat/koRpus_RSS_sample.xml
similarity index 100%
rename from packages/XiMpLe/inst/tests/koRpus_RSS_sample.xml
rename to packages/XiMpLe/tests/testthat/koRpus_RSS_sample.xml
diff --git a/packages/XiMpLe/inst/tests/sample_RSS_parsed.RData b/packages/XiMpLe/tests/testthat/sample_RSS_parsed.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_RSS_parsed.RData
rename to packages/XiMpLe/tests/testthat/sample_RSS_parsed.RData
diff --git a/packages/XiMpLe/inst/tests/sample_XML_node_attrs.RData b/packages/XiMpLe/tests/testthat/sample_XML_node_attrs.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_node_attrs.RData
rename to packages/XiMpLe/tests/testthat/sample_XML_node_attrs.RData
diff --git a/packages/XiMpLe/inst/tests/sample_XML_node_closed_dput.txt b/packages/XiMpLe/tests/testthat/sample_XML_node_closed_dput.txt
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_node_closed_dput.txt
rename to packages/XiMpLe/tests/testthat/sample_XML_node_closed_dput.txt
diff --git a/packages/XiMpLe/inst/tests/sample_XML_node_empty_dput.txt b/packages/XiMpLe/tests/testthat/sample_XML_node_empty_dput.txt
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_node_empty_dput.txt
rename to packages/XiMpLe/tests/testthat/sample_XML_node_empty_dput.txt
diff --git a/packages/XiMpLe/inst/tests/sample_XML_node_extracted.RData b/packages/XiMpLe/tests/testthat/sample_XML_node_extracted.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_node_extracted.RData
rename to packages/XiMpLe/tests/testthat/sample_XML_node_extracted.RData
diff --git a/packages/XiMpLe/inst/tests/sample_XML_tree.RData b/packages/XiMpLe/tests/testthat/sample_XML_tree.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_tree.RData
rename to packages/XiMpLe/tests/testthat/sample_XML_tree.RData
diff --git a/packages/XiMpLe/inst/tests/sample_XML_tree_changed.RData b/packages/XiMpLe/tests/testthat/sample_XML_tree_changed.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_tree_changed.RData
rename to packages/XiMpLe/tests/testthat/sample_XML_tree_changed.RData
diff --git a/packages/XiMpLe/inst/tests/sample_XML_tree_changed_value.RData b/packages/XiMpLe/tests/testthat/sample_XML_tree_changed_value.RData
similarity index 100%
rename from packages/XiMpLe/inst/tests/sample_XML_tree_changed_value.RData
rename to packages/XiMpLe/tests/testthat/sample_XML_tree_changed_value.RData
diff --git a/packages/XiMpLe/inst/tests/tests.R b/packages/XiMpLe/tests/testthat/tests.R
similarity index 100%
rename from packages/XiMpLe/inst/tests/tests.R
rename to packages/XiMpLe/tests/testthat/tests.R

More information about the rkward-tracker mailing list