Use test_that() everywhere

Fixes #629

Author: hadley

tests/testthat/_snaps/S4.md

@@ -1,4 +1,4 @@
-# S4_register / errors on unsupported inputs
+# S4_register errors on unsupported inputs
 
     Code
       S4_register(1)

tests/testthat/_snaps/class.md

@@ -1,4 +1,4 @@
-# S7 classes / print nicely
+# S7 classes print nicely
 
     Code
       foo2
@@ -41,7 +41,7 @@
       List of 1
        $ : <foo2/foo1/S7_object> constructor
 
-# S7 classes / prints @package and @abstract details
+# S7 classes print @package and @abstract details
 
     Code
       foo
@@ -52,7 +52,7 @@
       @ validator  : <NULL>
       @ properties :
 
-# S7 classes / shows property defaults and read-only annotations
+# S7 classes show property defaults and read-only annotations
 
     Code
       Person
@@ -69,7 +69,7 @@
        $ default_expr: S3<Date> = Sys.Date()
        $ read_only: <ANY> [read-only]
 
-# S7 classes / checks inputs
+# S7 classes check inputs
 
     Code
       new_class(1)
@@ -107,7 +107,7 @@
       Error in `new_class()`:
       ! `validator` must be function(self), not function().
 
-# S7 classes / can't inherit from S4 or class unions
+# S7 classes can't inherit from S4 or class unions
 
     Code
       new_class("test", parent = parentS4)
@@ -125,7 +125,7 @@
        * An S4 class object
        * A base class
 
-# abstract classes / can't be instantiated
+# abstract classes can't be instantiated
 
     Code
       foo := new_class(abstract = TRUE)
@@ -134,7 +134,7 @@
       Error in `S7::new_object()`:
       ! Can't construct an object from abstract class <foo>.
 
-# abstract classes / can't inherit from concrete class
+# abstract classes can't inherit from concrete class
 
     Code
       foo1 := new_class()
@@ -143,7 +143,7 @@
       Error in `new_class()`:
       ! Abstract classes must have abstract parents.
 
-# abstract classes / can use inherited validator from abstract class
+# abstract classes can use inherited validator from abstract class
 
     Code
       foo2(x = 2)
@@ -152,15 +152,15 @@
       ! <foo2> object is invalid:
       - @x has bad value
 
-# new_object() / gives useful error if called directly
+# new_object() gives useful error if called directly
 
     Code
       new_object()
     Condition
       Error in `new_object()`:
       ! `new_object()` must be called from within a constructor.
 
-# new_object() / errors if `_parent` doesn't inherit from the parent class (#409)
+# new_object() errors if `_parent` doesn't inherit from the parent class (#409)
 
     Code
       Foo()
@@ -173,15 +173,15 @@
       Error in `new_object()`:
       ! `_parent` must be an instance of <integer>, not <character>.
 
-# new_object() / errors if `_parent` is supplied but class has no parent
+# new_object() errors if `_parent` is supplied but class has no parent
 
     Code
       NoParent()
     Condition
       Error in `new_object()`:
       ! `_parent` must not be supplied when class has no parent.
 
-# new_object() / validates object
+# new_object() validates object
 
     Code
       foo("x")
@@ -196,7 +196,7 @@
       ! <foo> object is invalid:
       - x must be positive
 
-# new_object() / runs each parent validator exactly once
+# new_object() runs each parent validator exactly once
 
     Code
       . <- A()
@@ -211,7 +211,7 @@
     Output
       A B C 
 
-# S7 object / displays nicely
+# S7 object displays nicely
 
     Code
       foo := new_class(properties = list(x = class_double, y = class_double),
@@ -229,7 +229,7 @@
         ..@ x: num(0) 
         ..@ y: num(0) 
 
-# S7 object / displays objects with data nicely
+# S7 object displays objects with data nicely
 
     Code
       text := new_class(class_character, package = NULL)
@@ -242,7 +242,7 @@
       List of 1
        $ : <text> chr "x"
 
-# S7 object / displays data.frame subclasses without error (#494)
+# S7 object displays data.frame subclasses without error (#494)
 
     Code
       str(mydf(data.frame(a = 1:2, b = 1:2)))
@@ -252,7 +252,7 @@
        $ a: int  1 2
        $ b: int  1 2
 
-# S7 object / displays list objects nicely
+# S7 object displays list objects nicely
 
     Code
       foo1(list(x = 1, y = list(a = 21, b = 22)), x = 3, y = list(a = 41, b = 42))

tests/testthat/_snaps/method-introspect.md

@@ -1,4 +1,4 @@
-# method introspection / errors on invalid inputs
+# method introspection errors on invalid inputs
 
     Code
       method(print, 1)
@@ -33,7 +33,7 @@
       Error in `method()`:
       ! `object` must be length 2.
 
-# method introspection / errors if no method found
+# method introspection errors if no method found
 
     Code
       method(foo, class = class_integer)
@@ -60,7 +60,7 @@
       - x: <integer>
       - y: <double>
 
-# method explanation / shows all possible methods along with matches
+# method explanation shows all possible methods along with matches
 
        add([foo2], [foo2])
     -> add([foo2], [foo1])

tests/testthat/_snaps/method-register.md

@@ -1,12 +1,12 @@
-# method registration / adds messages when overwriting
+# method registration adds messages when overwriting
 
     Code
       method(foo, class_character) <- (function(x) "c")
       method(foo, class_character) <- (function(x) "c")
     Message
       Overwriting method foo(<character>)
 
-# method registration / checks argument types
+# method registration checks argument types
 
     Code
       x <- 10
@@ -25,15 +25,15 @@
        * An S4 class object
        * A base class
 
-# method unregistration / removes S7 method via NULL assignment
+# method unregistration removes an S7 method via NULL assignment
 
     Code
       foo("x")
     Condition
       Error:
       ! Can't find method for `foo(<character>)`.
 
-# method unregistration / removes method with multi-dispatch signature
+# method unregistration removes a method with a multi-dispatch signature
 
     Code
       foo(A(), B())
@@ -43,7 +43,7 @@
       - x: <S7::A>
       - y: <S7::B>
 
-# as_signature() / accepts a length-1 list for single dispatch (#555)
+# as_signature() accepts a length-1 list for single dispatch (#555)
 
     Code
       as_signature(list(1), foo)
@@ -56,7 +56,7 @@
        * An S4 class object
        * A base class
 
-# as_signature() / requires a list of the correct length for multiple dispatch
+# as_signature() requires a list of the correct length for multiple dispatch
 
     Code
       as_signature(class_character, foo)

tests/testthat/_snaps/property.md

@@ -1,4 +1,4 @@
-# property retrieval / retrieves the properties that exist & errors otherwise
+# property retrieval retrieves the properties that exist & errors otherwise
 
     Code
       prop(obj, "x")
@@ -11,15 +11,15 @@
       Error in `<foo>@x`:
       ! Property not found.
 
-# prop setting / can't set read-only properties
+# prop setting can't set read-only properties
 
     Code
       obj@x <- 1
     Condition
       Error in `<foo>@x`:
       ! Can't set read-only property.
 
-# prop setting / errors if the property doesn't exist or is wrong class
+# prop setting errors if the property doesn't exist or is wrong class
 
     Code
       obj <- foo(123)
@@ -33,7 +33,7 @@
       Error in `<foo>@x`:
       ! <foo>@x must be <double>, not <character>
 
-# prop setting / validates all attributes if custom setter
+# prop setting validates all attributes if custom setter
 
     Code
       obj <- foo(y = 123, x = 123)
@@ -42,15 +42,15 @@
       Error in `<foo>@y`:
       ! <foo>@y must be <double>, not <character>
 
-# prop setting / gives informative error if setter doesn't return an S7 object (#416)
+# prop setting gives informative error if setter doesn't return an S7 object (#416)
 
     Code
       foo(x = 1.1)
     Condition
       Error in `<foo>@x`:
       ! Custom setter must return an <S7_object>, not <integer>.
 
-# props<- / `check = FALSE` skip validation
+# props<- with `check = FALSE` skips validation
 
     Code
       validate(obj)
@@ -59,7 +59,7 @@
       ! <S7::foo> object is invalid:
       - bad
 
-# props<- / set_props() skip validation with `.check = FALSE`
+# props<- set_props() skips validation with `.check = FALSE`
 
     Code
       validate(obj2)
@@ -68,7 +68,7 @@
       ! <S7::foo> object is invalid:
       - bad
 
-# new_property() / validates getter and settor
+# new_property() validates getter and setter
 
     Code
       new_property(getter = function(x) { })
@@ -81,15 +81,15 @@
       Error in `new_property()`:
       ! `setter` must be function(self, value) or function(self, name, value), not function(x, y, z).
 
-# new_property() / validates default
+# new_property() validates default
 
     Code
       new_property(class_integer, default = "x")
     Condition
       Error in `new_property()`:
       ! `default` must be an instance of <integer>, not a <character>.
 
-# new_property() / displays nicely
+# new_property() displays nicely
 
     Code
       print(x)

tests/testthat/_snaps/super.md

@@ -1,4 +1,4 @@
-# super() / checks to
+# super() checks to
 
     Code
       foo := new_class(package = NULL)
@@ -17,7 +17,7 @@
       Error in `super()`:
       ! `to` must be an S7, S3, S4, or base class, not NULL.
 
-# super() / displays nicely
+# super() displays nicely
 
     Code
       f1 <- super(foo2(), foo1)