Home`
* - ``
- *
+ *
* For checking the raw source code, use `seeInSource()`.
*
- * @param $text
- * @param null $selector
+ * @param string $text
+ * @param string $selector optional
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::dontSee()
*/
@@ -330,27 +358,28 @@ trait AcceptanceTesterActions
*
* ```php
* dontSee('Login'); // I can suppose user is already logged in
- * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page
- * $I->dontSee('Sign Up','//body/h1'); // with XPath
+ * $I->dontSee('Login'); // I can suppose user is already logged in
+ * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page
+ * $I->dontSee('Sign Up','//body/h1'); // with XPath
+ * $I->dontSee('Sign Up', ['css' => 'body h1']); // with strict CSS locator
* ```
- *
+ *
* Note that the search is done after stripping all HTML tags from the body,
* so `$I->dontSee('strong')` will fail on strings like:
- *
+ *
* - `
`
* - ``
- *
+ *
* But will ignore strings like:
- *
+ *
* - `
Home`
* - ``
- *
+ *
* For checking the raw source code, use `seeInSource()`.
*
- * @param $text
- * @param null $selector
+ * @param string $text
+ * @param string $selector optional
* @see \Codeception\Lib\InnerBrowser::dontSee()
*/
public function dontSee($text, $selector = null) {
@@ -445,8 +474,8 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $text
- * @param null $url
+ * @param string $text
+ * @param string $url optional
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeLink()
*/
@@ -466,8 +495,8 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $text
- * @param null $url
+ * @param string $text
+ * @param string $url optional
* @see \Codeception\Lib\InnerBrowser::seeLink()
*/
public function seeLink($text, $url = null) {
@@ -488,8 +517,8 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $text
- * @param null $url
+ * @param string $text
+ * @param string $url optional
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::dontSeeLink()
*/
@@ -509,8 +538,8 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $text
- * @param null $url
+ * @param string $text
+ * @param string $url optional
* @see \Codeception\Lib\InnerBrowser::dontSeeLink()
*/
public function dontSeeLink($text, $url = null) {
@@ -532,7 +561,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
*/
@@ -553,7 +582,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
*/
public function seeInCurrentUrl($uri) {
@@ -572,7 +601,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
*/
@@ -590,7 +619,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
*/
public function dontSeeInCurrentUrl($uri) {
@@ -611,7 +640,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
*/
@@ -631,7 +660,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
*/
public function seeCurrentUrlEquals($uri) {
@@ -652,7 +681,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
*/
@@ -672,7 +701,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
*/
public function dontSeeCurrentUrlEquals($uri) {
@@ -692,7 +721,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
*/
@@ -711,7 +740,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
*/
public function seeCurrentUrlMatches($uri) {
@@ -731,7 +760,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
*/
@@ -750,7 +779,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param $uri
+ * @param string $uri
* @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
*/
public function dontSeeCurrentUrlMatches($uri) {
@@ -761,7 +790,7 @@ trait AcceptanceTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Executes the given regular expression against the current URI and returns the first match.
+ * Executes the given regular expression against the current URI and returns the first capturing group.
* If no parameters are provided, the full URI is returned.
*
* ``` php
@@ -771,7 +800,7 @@ trait AcceptanceTesterActions
* ?>
* ```
*
- * @param null $uri
+ * @param string $uri optional
*
* @return mixed
* @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
@@ -864,8 +893,8 @@ trait AcceptanceTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Checks that the given input field or textarea contains the given value.
- * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+ * Checks that the given input field or textarea *equals* (i.e. not just contains) the given value.
+ * Fields are matched by label text, the "name" attribute, CSS, or XPath.
*
* ``` php
* value) are set on the form matched with the
* passed selector.
- *
+ *
* ``` php
* seeInFormFields('form[name=myform]', [
@@ -977,10 +1006,10 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* For multi-select elements, or to check values of multiple elements with the same name, an
* array may be passed:
- *
+ *
* ``` php
* seeInFormFields('.form-class', [
@@ -997,7 +1026,7 @@ trait AcceptanceTesterActions
* ```
*
* Additionally, checkbox values can be checked with a boolean.
- *
+ *
* ``` php
* seeInFormFields('#form-id', [
@@ -1006,9 +1035,9 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* Pair this with submitForm for quick testing magic.
- *
+ *
* ``` php
* seeInFormFields('//form[@id=my-form]', $form);
* ?>
* ```
- *
+ *
* @param $formSelector
* @param $params
* Conditional Assertion: Test won't be stopped on fail
@@ -1036,7 +1065,7 @@ trait AcceptanceTesterActions
*
* Checks if the array of form parameters (name => value) are set on the form matched with the
* passed selector.
- *
+ *
* ``` php
* seeInFormFields('form[name=myform]', [
@@ -1045,10 +1074,10 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* For multi-select elements, or to check values of multiple elements with the same name, an
* array may be passed:
- *
+ *
* ``` php
* seeInFormFields('.form-class', [
@@ -1065,7 +1094,7 @@ trait AcceptanceTesterActions
* ```
*
* Additionally, checkbox values can be checked with a boolean.
- *
+ *
* ``` php
* seeInFormFields('#form-id', [
@@ -1074,9 +1103,9 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* Pair this with submitForm for quick testing magic.
- *
+ *
* ``` php
* seeInFormFields('//form[@id=my-form]', $form);
* ?>
* ```
- *
+ *
* @param $formSelector
* @param $params
* @see \Codeception\Lib\InnerBrowser::seeInFormFields()
@@ -1105,7 +1134,7 @@ trait AcceptanceTesterActions
*
* Checks if the array of form parameters (name => value) are not set on the form matched with
* the passed selector.
- *
+ *
* ``` php
* dontSeeInFormFields('form[name=myform]', [
@@ -1114,10 +1143,10 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* To check that an element hasn't been assigned any one of many values, an array can be passed
* as the value:
- *
+ *
* ``` php
* dontSeeInFormFields('.form-class', [
@@ -1130,7 +1159,7 @@ trait AcceptanceTesterActions
* ```
*
* Additionally, checkbox values can be checked with a boolean.
- *
+ *
* ``` php
* dontSeeInFormFields('#form-id', [
@@ -1139,7 +1168,7 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* @param $formSelector
* @param $params
* Conditional Assertion: Test won't be stopped on fail
@@ -1153,7 +1182,7 @@ trait AcceptanceTesterActions
*
* Checks if the array of form parameters (name => value) are not set on the form matched with
* the passed selector.
- *
+ *
* ``` php
* dontSeeInFormFields('form[name=myform]', [
@@ -1162,10 +1191,10 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* To check that an element hasn't been assigned any one of many values, an array can be passed
* as the value:
- *
+ *
* ``` php
* dontSeeInFormFields('.form-class', [
@@ -1178,7 +1207,7 @@ trait AcceptanceTesterActions
* ```
*
* Additionally, checkbox values can be checked with a boolean.
- *
+ *
* ``` php
* dontSeeInFormFields('#form-id', [
@@ -1187,7 +1216,7 @@ trait AcceptanceTesterActions
* ]);
* ?>
* ```
- *
+ *
* @param $formSelector
* @param $params
* @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
@@ -1200,22 +1229,22 @@ trait AcceptanceTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Submits the given form on the page, optionally with the given form
+ * Submits the given form on the page, with the given form
* values. Pass the form field's values as an array in the second
* parameter.
*
- * Although this function can be used as a short-hand version of
- * `fillField()`, `selectOption()`, `click()` etc. it has some important
+ * Although this function can be used as a short-hand version of
+ * `fillField()`, `selectOption()`, `click()` etc. it has some important
* differences:
- *
+ *
* * Only field *names* may be used, not CSS/XPath selectors nor field labels
* * If a field is sent to this function that does *not* exist on the page,
* it will silently be added to the HTTP request. This is helpful for testing
* some types of forms, but be aware that you will *not* get an exception
* like you would if you called `fillField()` or `selectOption()` with
* a missing field.
- *
- * Fields that are not provided will be filled by their values from the page,
+ *
+ * Fields that are not provided will be filled by their values from the page,
* or from any previous calls to `fillField()`, `selectOption()` etc.
* You don't need to click the 'Submit' button afterwards.
* This command itself triggers the request to form's action.
@@ -1278,10 +1307,10 @@ trait AcceptanceTesterActions
* ```
* Note that "2" will be the submitted value for the "plan" field, as it is
* the selected option.
- *
+ *
* You can also emulate a JavaScript submission by not specifying any
* buttons in the third parameter to submitForm.
- *
+ *
* ```php
* submitForm(
@@ -1295,10 +1324,10 @@ trait AcceptanceTesterActions
* ]
* );
* ```
- *
- * This function works well when paired with `seeInFormFields()`
+ *
+ * This function works well when paired with `seeInFormFields()`
* for quickly testing CRUD interfaces and form validation logic.
- *
+ *
* ``` php
* 'another value', // 'field[]' is already a defined key
* ]);
* ```
- *
+ *
* The solution is to pass an array value:
- *
+ *
* ```php
*
* ```
*
+ * Or provide an associative array for the second argument to specifically define which selection method should be used:
+ *
+ * ``` php
+ * selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
+ * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
+ * ?>
+ * ```
+ *
* @param $select
* @param $option
* @see \Codeception\Lib\InnerBrowser::selectOption()
@@ -1468,7 +1506,7 @@ trait AcceptanceTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Attaches a file relative to the Codeception data directory to the given file upload field.
+ * Attaches a file relative to the Codeception `_data` directory to the given file upload field.
*
* ``` php
* First
*
Second
*
Third
* ```
- *
+ *
* ```php
* grabMultiple('a');
- *
+ *
* // would return ['#first', '#second', '#third']
* $aLinks = $I->grabMultiple('a', 'href');
* ?>
* ```
- *
+ *
* @param $cssOrXpath
* @param $attribute
* @return string[]
@@ -1691,6 +1730,21 @@ trait AcceptanceTesterActions
}
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Grabs current page source code.
+ *
+ * @throws ModuleException if no page was opened.
+ *
+ * @return string Current page source code.
+ * @see \Codeception\Lib\InnerBrowser::grabPageSource()
+ */
+ public function grabPageSource() {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('grabPageSource', func_get_args()));
+ }
+
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1894,13 +1948,11 @@ trait AcceptanceTesterActions
* ``` php
* seeNumberOfElements('tr', 10);
- * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+ * $I->seeNumberOfElements('tr', [0,10]); // between 0 and 10 elements
* ?>
* ```
* @param $selector
- * @param mixed $expected :
- * - string: strict number
- * - array: range of numbers [0,10]
+ * @param mixed $expected int or int[]
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
*/
@@ -1915,13 +1967,11 @@ trait AcceptanceTesterActions
* ``` php
* seeNumberOfElements('tr', 10);
- * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+ * $I->seeNumberOfElements('tr', [0,10]); // between 0 and 10 elements
* ?>
* ```
* @param $selector
- * @param mixed $expected :
- * - string: strict number
- * - array: range of numbers [0,10]
+ * @param mixed $expected int or int[]
* @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
*/
public function seeNumberOfElements($selector, $expected) {
@@ -2041,9 +2091,15 @@ trait AcceptanceTesterActions
*
* Checks that response code is equal to value provided.
*
- * @param $code
+ * ```php
+ * seeResponseCodeIs(200);
*
- * @return mixed
+ * // recommended \Codeception\Util\HttpCode
+ * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+ * ```
+ *
+ * @param $code
* Conditional Assertion: Test won't be stopped on fail
* @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
*/
@@ -2055,9 +2111,15 @@ trait AcceptanceTesterActions
*
* Checks that response code is equal to value provided.
*
- * @param $code
+ * ```php
+ * seeResponseCodeIs(200);
*
- * @return mixed
+ * // recommended \Codeception\Util\HttpCode
+ * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+ * ```
+ *
+ * @param $code
* @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
*/
public function seeResponseCodeIs($code) {
@@ -2065,6 +2127,45 @@ trait AcceptanceTesterActions
}
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Checks that response code is equal to value provided.
+ *
+ * ```php
+ * dontSeeResponseCodeIs(200);
+ *
+ * // recommended \Codeception\Util\HttpCode
+ * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+ * ```
+ * @param $code
+ * Conditional Assertion: Test won't be stopped on fail
+ * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+ */
+ public function cantSeeResponseCodeIs($code) {
+ return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
+ }
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Checks that response code is equal to value provided.
+ *
+ * ```php
+ * dontSeeResponseCodeIs(200);
+ *
+ * // recommended \Codeception\Util\HttpCode
+ * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+ * ```
+ * @param $code
+ * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+ */
+ public function dontSeeResponseCodeIs($code) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
+ }
+
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2163,7 +2264,7 @@ trait AcceptanceTesterActions
* [!] Method is generated. Documentation taken from corresponding module.
*
* Moves back in history.
- *
+ *
* @param int $numberOfSteps (default value 1)
* @see \Codeception\Lib\InnerBrowser::moveBack()
*/
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
index edbc21a..3462387 100644
--- a/tests/_support/_generated/UnitTesterActions.php
+++ b/tests/_support/_generated/UnitTesterActions.php
@@ -1,4 +1,4 @@
-assertEquals($element->getChildrenCount(), 5);
+ * ```
+ *
+ * Floating-point example:
+ * ```php
+ * assertEquals($calculator->add(0.1, 0.2), 0.3, 'Calculator should add the two numbers correctly.', 0.01);
+ * ```
*
* @param $expected
* @param $actual
* @param string $message
+ * @param float $delta
* @see \Codeception\Module\Asserts::assertEquals()
*/
- public function assertEquals($expected, $actual, $message = null) {
+ public function assertEquals($expected, $actual, $message = null, $delta = null) {
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
}
@@ -35,14 +50,29 @@ trait UnitTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Checks that two variables are not equal
+ * Checks that two variables are not equal. If you're comparing floating-point values,
+ * you can specify the optional "delta" parameter which dictates how great of a precision
+ * error are you willing to tolerate in order to consider the two values not equal.
+ *
+ * Regular example:
+ * ```php
+ * assertNotEquals($element->getChildrenCount(), 0);
+ * ```
+ *
+ * Floating-point example:
+ * ```php
+ * assertNotEquals($calculator->add(0.1, 0.2), 0.4, 'Calculator should add the two numbers correctly.', 0.01);
+ * ```
*
* @param $expected
* @param $actual
* @param string $message
+ * @param float $delta
* @see \Codeception\Module\Asserts::assertNotEquals()
*/
- public function assertNotEquals($expected, $actual, $message = null) {
+ public function assertNotEquals($expected, $actual, $message = null, $delta = null) {
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
}
@@ -92,17 +122,6 @@ trait UnitTesterActions
}
- /**
- * [!] Method is generated. Documentation taken from corresponding module.
- *
- * @deprecated
- * @see \Codeception\Module\Asserts::assertGreaterThen()
- */
- public function assertGreaterThen($expected, $actual, $message = null) {
- return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThen', func_get_args()));
- }
-
-
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -118,17 +137,6 @@ trait UnitTesterActions
}
- /**
- * [!] Method is generated. Documentation taken from corresponding module.
- *
- * @deprecated
- * @see \Codeception\Module\Asserts::assertGreaterThenOrEqual()
- */
- public function assertGreaterThenOrEqual($expected, $actual, $message = null) {
- return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThenOrEqual', func_get_args()));
- }
-
-
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -219,6 +227,36 @@ trait UnitTesterActions
}
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Checks that a string starts with the given prefix.
+ *
+ * @param string $prefix
+ * @param string $string
+ * @param string $message
+ * @see \Codeception\Module\Asserts::assertStringStartsWith()
+ */
+ public function assertStringStartsWith($prefix, $string, $message = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Checks that a string doesn't start with the given prefix.
+ *
+ * @param string $prefix
+ * @param string $string
+ * @param string $message
+ * @see \Codeception\Module\Asserts::assertStringStartsNotWith()
+ */
+ public function assertStringStartsNotWith($prefix, $string, $message = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
+ }
+
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -334,13 +372,93 @@ trait UnitTesterActions
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
- * Fails the test with message.
- *
- * @param $message
- * @see \Codeception\Module\Asserts::fail()
+ * @param $expected
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
*/
- public function fail($message) {
- return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
+ public function assertGreaterOrEquals($expected, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $expected
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertLessOrEquals()
+ */
+ public function assertLessOrEquals($expected, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertIsEmpty()
+ */
+ public function assertIsEmpty($actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $key
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertArrayHasKey()
+ */
+ public function assertArrayHasKey($key, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $key
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
+ */
+ public function assertArrayNotHasKey($key, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Checks that array contains subset.
+ *
+ * @param array $subset
+ * @param array $array
+ * @param bool $strict
+ * @param string $message
+ * @see \Codeception\Module\Asserts::assertArraySubset()
+ */
+ public function assertArraySubset($subset, $array, $strict = null, $message = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $expectedCount
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertCount()
+ */
+ public function assertCount($expectedCount, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
}
@@ -357,6 +475,79 @@ trait UnitTesterActions
}
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $class
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertNotInstanceOf()
+ */
+ public function assertNotInstanceOf($class, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * @param $type
+ * @param $actual
+ * @param $description
+ * @see \Codeception\Module\Asserts::assertInternalType()
+ */
+ public function assertInternalType($type, $actual, $description = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Fails the test with message.
+ *
+ * @param $message
+ * @see \Codeception\Module\Asserts::fail()
+ */
+ public function fail($message) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
+ }
+
+
+ /**
+ * [!] Method is generated. Documentation taken from corresponding module.
+ *
+ * Handles and checks exception called inside callback function.
+ * Either exception class name or exception instance should be provided.
+ *
+ * ```php
+ * expectException(MyException::class, function() {
+ * $this->doSomethingBad();
+ * });
+ *
+ * $I->expectException(new MyException(), function() {
+ * $this->doSomethingBad();
+ * });
+ * ```
+ * If you want to check message or exception code, you can pass them with exception instance:
+ * ```php
+ * expectException(new MyException("Don't do bad things"), function() {
+ * $this->doSomethingBad();
+ * });
+ * ```
+ *
+ * @param $exception string or \Exception
+ * @param $callback
+ * @see \Codeception\Module\Asserts::expectException()
+ */
+ public function expectException($exception, $callback) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
+ }
+
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
deleted file mode 100644
index 2269e0c..0000000
--- a/tests/acceptance.suite.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for acceptance tests.
-# Perform tests in browser using the WebDriver or PhpBrowser.
-# If you need both WebDriver and PHPBrowser tests - create a separate suite.
-
-class_name: AcceptanceTester
-modules:
- enabled:
- - PhpBrowser:
- url: http://localhost/myapp
- - \Helper\Acceptance
\ No newline at end of file
diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php
deleted file mode 100644
index 8a88555..0000000
--- a/tests/acceptance/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-dataDir = codecept_data_dir();
- }
-
- public function _before(UnitTester $I)
- {
- $this->builder = new Abc();
- }
-
- public function _after(UnitTester $I)
- {
- unset($builder);
- }
-
- // tests: trying to...
- public function createParser(UnitTester $I)
- {
- $parser = new Parser($this->builder);
-
- $I->assertInstanceOf(Parser::class, $parser);
- }
-
- public function seeParseEmptyAbcWithoutErrors(UnitTester $I)
- {
- $abc = '';
- $parser = new Parser($this->builder);
-
- $result = $parser->parseABC($abc);
- $I->assertEmpty($result);
- }
-
- public function seeParseABCExample1(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_1.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 1 => [
- 'X' => '3',
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
- ],
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-
- public function seeParseABCExample2(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_2.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 1 => [
- 'X' => '40',
- 'T' => ['Abbotts Bromley Horn Dance'],
- 'A' => ['trad'],
- 'C' => ['trad.'],
- 'D' => ['None'],
- 'G' => ['lute'],
- 'H' => [
- 'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
- ],
- 'R' => ['Jig'],
- 'F' => ['none.abc'],
- 'B' => ['Traditional English tunes'],
- 'W' => ['None'],
- 'Q' => '1/8=80',
- 'L' => '1/8',
- 'M' => '6/8',
- 'N' => ['Traditional English'],
- 'O' => ['England'],
- 'Z' => ['Andy Hornby'],
- 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
- 'P' => 'ABC',
- 'K' => 'G',
- 'music' => 'e|B2e G2e|B2e E2G|FGA GAB|1AGF G2:|2AGF E2|
-|e|c2e cde|A2c ABc|FGA GFE|_E=EF B,2g|
-e2g efg|c2e cde|dcB AGF|E3E2
-|:A|BcB e3|BcB f3|BcB AGF|1G2F G2:|2E3-E2|]'
- ],
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-
-
- public function seeParseABCExample3(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_3.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 'A' => ['trad'],
- 'C' => ['trad.'],
- 'D' => ['None'],
- 'H' => [
- 'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
- ],
- 'R' => ['Jig'],
- 'F' => ['none.abc'],
- 'B' => ['Traditional English tunes'],
- 'L' => '1/8',
- 'M' => '6/8',
- 'N' => ['Traditional English'],
- 'O' => ['England'],
- 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
- 'Z' => ['Andy Hornby'],
-
- 1 => [
- 'X' => '3',
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
- ]
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-}
diff --git a/tests/functional/laravel5/CollectionCest.php b/tests/functional/laravel5/CollectionCest.php
deleted file mode 100644
index bd9fb0e..0000000
--- a/tests/functional/laravel5/CollectionCest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-tune_id = 1;
- $model->type = 'Title';
- $model->string = 'a title';
- $model->ordering = 1;
- $I->assertCanSave($model);
- }
-}
diff --git a/tests/unit/Laravel5/AbcParserDBTest.php b/tests/unit/Laravel5/AbcParserDBTest.php
deleted file mode 100644
index f27b99f..0000000
--- a/tests/unit/Laravel5/AbcParserDBTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-dataDir = codecept_data_dir();
- }
-
- // tests: trying to...
- public function testSaveAbcFromExample1()
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_1.abc');
- $parser = new Parser($this->builder);
-
- $result = $parser->parseABC($abc);
- $this->assertTrue($result->save());
- }
-
- public function testSaveAbcFromExample2()
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_2.abc');
- $parser = new Parser($this->builder);
-
- $result = $parser->parseABC($abc);
- $this->assertTrue($result->save());
- }
-
- public function testSaveAbcFromExample3()
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_3.abc');
- $parser = new Parser($this->builder);
-
- $result = $parser->parseABC($abc);
- $this->assertTrue($result->save());
-
- $this->seeInDatabase('tune_settings', []);
- $this->seeInDatabase('tunes', []);
- }
-}
diff --git a/tests/unit/Laravel5/BaseDbTest.php b/tests/unit/Laravel5/BaseDbTest.php
deleted file mode 100644
index 2e540de..0000000
--- a/tests/unit/Laravel5/BaseDbTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-set('database.default', 'testbench');
- $app['config']->set('database.connections.testbench', [
- 'driver' => 'sqlite',
- 'database' => ':memory:',
- 'prefix' => '',
- ]);
- $app->setBasePath(dirname(dirname(dirname(__DIR__))));
- $Artisan = $app->make('Artisan');
- $Artisan::call('migrate');
- }
-
- protected function _before()
- {
- $this->startApplication();
- $db = app()->make('db');
- $db->beginTransaction();
-
- $this->withFactories(__DIR__ . '/factories');
- $this->builder = new Abc();
- }
-
- protected function _after()
- {
- $db = app()->make('db');
- $db->rollBack();
- $this->stopApplication();
- }
-}
diff --git a/tests/unit/Laravel5/CollectionAttributeTest.php b/tests/unit/Laravel5/CollectionAttributeTest.php
deleted file mode 100644
index 45355d1..0000000
--- a/tests/unit/Laravel5/CollectionAttributeTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-create();
- $type = 'Note';
- $value = 'a title';
- $ordering = 1;
- $model = new CollectionAttribute();
- $model->collection_id = $collection->id;
- $model->type = $type;
- $model->string = $value;
- $model->ordering = $ordering;
-
- $this->assertInstanceOf(CollectionAttribute::class, $model);
- $this->assertEquals($collection->id, $model->collection_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($value, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testMassAssignable()
- {
- $collection = factory(Collection::class)->create();
- $type = 'Note';
- $value = 'a title';
- $ordering = 1;
- $model = CollectionAttribute::create([
- 'collection_id' => $collection->id,
- 'type' => $type,
- 'string' => $value,
- 'ordering' => $ordering
- ]);
-
- $this->assertInstanceOf(CollectionAttribute::class, $model);
- $this->assertEquals($collection->id, $model->collection_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($value, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testFactory()
- {
- $model = factory(CollectionAttribute::class)->make([]);
-
- $this->assertInstanceOf(CollectionAttribute::class, $model);
- $this->assertNotNull($model->collection_id);
- $this->assertNotNull($model->type);
- $this->assertNotNull($model->string);
- $this->assertNotNull($model->ordering);
- $this->assertTrue($model->save(), json_encode($model->getMessages()));
- }
-
- public function testValidationAppliedOnSave()
- {
- $model = factory(CollectionAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->save());
- }
-
- public function testTypeValidation()
- {
- $model = factory(CollectionAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->validate());
- }
-
- public function testTuneIdValidation()
- {
- $model = factory(CollectionAttribute::class)->make([]);
- $model->collection_id = Uuid::generate(4);
-
- $this->assertFalse($model->validate());
- }
-
- public function testStringValidation()
- {
- $longString = '';
- for ($i=0; $i < 300; $i++) {
- $longString .= 's';
- }
- $model = factory(CollectionAttribute::class)->make([]);
- $model->string = $longString;
-
- $this->assertFalse($model->validate());
- }
-
- public function testOrderingValidation()
- {
- $model = factory(CollectionAttribute::class)->make([]);
- $model->ordering = "fourth";
-
- $this->assertFalse($model->validate());
- }
-}
diff --git a/tests/unit/Laravel5/CollectionTest.php b/tests/unit/Laravel5/CollectionTest.php
deleted file mode 100644
index 774cadf..0000000
--- a/tests/unit/Laravel5/CollectionTest.php
+++ /dev/null
@@ -1,523 +0,0 @@
-set('database.default', 'testbench');
-// $app['config']->set('database.connections.testbench', [
-// 'driver' => 'sqlite',
-// 'database' => ':memory:',
-// 'prefix' => '',
-// ]);
-// $app->setBasePath(dirname(dirname(dirname(__DIR__))));
-// $Artisan = $app->make('Artisan');
-// $Artisan::call('migrate');
-// }
-//
-//
-// protected function _before()
-// {
-// $this->startApplication();
-// $db = app()->make('db');
-// $db->beginTransaction();
-//
-// $this->withFactories(__DIR__.'/factories');
-// }
-//
-// protected function _after()
-// {
-// $db = app()->make('db');
-// $db->rollBack();
-// $this->stopApplication();
-// }
-
- // tests: trying to...
-
- public function testMakeModel()
- {
- $name = "test1";
- $model = new Collection();
- $model->name = $name;
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEquals($name, $model->name);
- }
-
- public function testNameIsMassAssignable()
- {
- $name = "test1";
- $model = Collection::create(['name'=>$name]);
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEquals($name, $model->name);
- }
-
- public function testFactorySetsName()
- {
- $model = factory(Collection::class)->make([]);
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertNotEmpty($model->name);
- }
-
- public function testAppendToCollection()
- {
- $setting = new \stdClass();
-
- $model = factory(Collection::class)->make([]);
-
- $result = $model->appendSetting($setting);
-
- $this->assertInstanceOf(\Illuminate\Support\Collection::class, $result);
- $this->assertContains($setting, $result);
- }
-
- public function testCanGetAuthorAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Author',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->A[0]);
- }
-
- public function testSetAuthorAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->A = $values;
-
- $this->assertEquals($values[0], $model->A[0]);
- $this->assertEquals($values[1], $model->A[1]);
- }
-
- public function testAuthorAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->A = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->A[0]);
- $this->assertEquals($values[1], $model->A[1]);
- }
-
- public function testCanGetComposerAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Composer',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->C[0]);
- }
-
- public function testSetComposerAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->C = $values;
-
- $this->assertEquals($values[0], $model->C[0]);
- $this->assertEquals($values[1], $model->C[1]);
- }
-
- public function testComposerAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->C = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->C[0]);
- $this->assertEquals($values[1], $model->C[1]);
- }
-
- public function testCanGetDiscographyAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Discography',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->D[0]);
- }
-
- public function testSetDiscographyAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->D = $values;
-
- $this->assertEquals($values[0], $model->D[0]);
- $this->assertEquals($values[1], $model->D[1]);
- }
-
- public function testDiscographyAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->D = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->D[0]);
- $this->assertEquals($values[1], $model->D[1]);
- }
-
-
- public function testCanGetRhythmAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Rhythm',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->R[0]);
- }
-
- public function testSetRhythmAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->R = $values;
-
- $this->assertEquals($values[0], $model->R[0]);
- $this->assertEquals($values[1], $model->R[1]);
- }
-
- public function testRhythmAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->R = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->R[0]);
- $this->assertEquals($values[1], $model->R[1]);
- }
-
-
- public function testCanGetHistoryAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'History',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->H[0]);
- }
-
- public function testSetHistoryAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->H = $values;
-
- $this->assertEquals($values[0], $model->H[0]);
- $this->assertEquals($values[1], $model->H[1]);
- }
-
- public function testHistoryAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->A = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->A[0]);
- $this->assertEquals($values[1], $model->A[1]);
- }
-
-
- public function testCanGetFileAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'File',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->F[0]);
- }
-
- public function testSetFileAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->F = $values;
-
- $this->assertEquals($values[0], $model->F[0]);
- $this->assertEquals($values[1], $model->F[1]);
- }
-
- public function testFileAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->F = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->F[0]);
- $this->assertEquals($values[1], $model->F[1]);
- }
-
-
- public function testCanGetBookAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Book',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->B[0]);
- }
-
- public function testSetBookAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->B = $values;
-
- $this->assertEquals($values[0], $model->B[0]);
- $this->assertEquals($values[1], $model->B[1]);
- }
-
- public function testBookAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->B = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->B[0]);
- $this->assertEquals($values[1], $model->B[1]);
- }
-
-
- public function testCanGetNoteAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Note',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->N[0]);
- }
-
- public function testSetNoteAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->N = $values;
-
- $this->assertEquals($values[0], $model->N[0]);
- $this->assertEquals($values[1], $model->N[1]);
- }
-
- public function testNoteAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->N = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->N[0]);
- $this->assertEquals($values[1], $model->N[1]);
- }
-
-
- public function testCanGetSourceAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Source',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->S[0]);
- }
-
- public function testSetSourceAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->S = $values;
-
- $this->assertEquals($values[0], $model->S[0]);
- $this->assertEquals($values[1], $model->S[1]);
- }
-
- public function testSourceAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->S = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->S[0]);
- $this->assertEquals($values[1], $model->S[1]);
- }
-
-
- public function testCanGetTranscriberAttribute()
- {
- $string = 'Arthur';
- $model = factory(Collection::class)->create([]);
- $attr = factory(CollectionAttribute::class)->create([
- 'collection_id' => $model->id,
- 'type' => 'Transcriber',
- 'string' => $string,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Collection::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($string, $model->Z[0]);
- }
-
- public function testSetTranscriberAttribute()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->Z = $values;
-
- $this->assertEquals($values[0], $model->Z[0]);
- $this->assertEquals($values[1], $model->Z[1]);
- }
-
- public function testTranscriberAttributeSaves()
- {
- $values = ['England', 'Scotland'];
- $model = factory(Collection::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->Z = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->Z[0]);
- $this->assertEquals($values[1], $model->Z[1]);
- }
-}
diff --git a/tests/unit/Laravel5/PersonTest.php b/tests/unit/Laravel5/PersonTest.php
deleted file mode 100644
index 844fbfd..0000000
--- a/tests/unit/Laravel5/PersonTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-name = $name;
-
- $this->assertInstanceOf(Person::class, $model);
- $this->assertEquals($name, $model->name);
- }
-
- public function testNameIsMassAssignable()
- {
- $name = "test1";
- $model = Person::create([
- 'name' =>$name,
- 'email' => 'me@example.com',
- ]);
-
- $this->assertInstanceOf(Person::class, $model);
- $this->assertEquals($name, $model->name);
- }
-
- public function testFactorySetsName()
- {
- $model = factory(Person::class)->make([]);
-
- $this->assertInstanceOf(Person::class, $model);
- $this->assertNotEmpty($model->name);
- }
-}
diff --git a/tests/unit/Laravel5/TuneAttributeTest.php b/tests/unit/Laravel5/TuneAttributeTest.php
deleted file mode 100644
index 22043fb..0000000
--- a/tests/unit/Laravel5/TuneAttributeTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-create();
- $type = 'Title';
- $title = 'a title';
- $ordering = 1;
- $model = new TuneAttribute();
- $model->tune_id = $tune->id;
- $model->type = $type;
- $model->string = $title;
- $model->ordering = $ordering;
-
- $this->assertInstanceOf(TuneAttribute::class, $model);
- $this->assertEquals($tune->id, $model->tune_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($title, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testMassAssignable()
- {
- $tune = factory(Tune::class)->create();
- $type = 'Title';
- $title = 'a title';
- $ordering = 1;
- $model = TuneAttribute::create([
- 'tune_id' => $tune->id,
- 'type' => $type,
- 'string' => $title,
- 'ordering' => $ordering
- ]);
-
- $this->assertInstanceOf(TuneAttribute::class, $model);
- $this->assertEquals($tune->id, $model->tune_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($title, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testFactory()
- {
- $model = factory(TuneAttribute::class)->make([]);
-
- $this->assertInstanceOf(TuneAttribute::class, $model);
- $this->assertNotNull($model->tune_id);
- $this->assertNotNull($model->type);
- $this->assertNotNull($model->string);
- $this->assertNotNull($model->ordering);
- $this->assertTrue($model->save(), json_encode($model->getMessages()));
- }
-
- public function testValidationAppliedOnSave()
- {
- $model = factory(TuneAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->save());
- }
-
- public function testTypeValidation()
- {
- $model = factory(TuneAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->validate());
- }
-
- public function testTuneIdValidation()
- {
- $model = factory(TuneAttribute::class)->make([]);
- $model->tune_id = Uuid::generate(4);
-
- $this->assertFalse($model->validate());
- }
-
- public function testStringValidation()
- {
- $longString = '';
- for ($i=0; $i < 300; $i++) {
- $longString .= 's';
- }
- $model = factory(TuneAttribute::class)->make([]);
- $model->string = $longString;
-
- $this->assertFalse($model->validate());
- }
-
- public function testOrderingValidation()
- {
- $model = factory(TuneAttribute::class)->make([]);
- $model->ordering = "fourth";
-
- $this->assertFalse($model->validate());
- }
-}
diff --git a/tests/unit/Laravel5/TuneSettingAttributeTest.php b/tests/unit/Laravel5/TuneSettingAttributeTest.php
deleted file mode 100644
index a172dff..0000000
--- a/tests/unit/Laravel5/TuneSettingAttributeTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-create();
- $type = 'Title';
- $title = 'a title';
- $ordering = 1;
- $model = new TuneSettingAttribute();
- $model->tune_id = $tune->id;
- $model->type = $type;
- $model->string = $title;
- $model->ordering = $ordering;
-
- $this->assertInstanceOf(TuneSettingAttribute::class, $model);
- $this->assertEquals($tune->id, $model->tune_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($title, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testMassAssignable()
- {
- $setting = factory(TuneSetting::class)->create();
- $type = 'Notes';
- $value = 'a little note';
- $ordering = 1;
- $model = TuneSettingAttribute::create([
- 'setting_id' => $setting->id,
- 'type' => $type,
- 'string' => $value,
- 'ordering' => $ordering
- ]);
-
- $this->assertInstanceOf(TuneSettingAttribute::class, $model);
- $this->assertEquals($setting->id, $model->setting_id);
- $this->assertEquals($type, $model->type);
- $this->assertEquals($value, $model->string);
- $this->assertEquals($ordering, $model->ordering);
- }
-
- public function testFactory()
- {
- $model = factory(TuneSettingAttribute::class)->make([]);
-
- $this->assertInstanceOf(TuneSettingAttribute::class, $model);
- $this->assertNotNull($model->setting_id);
- $this->assertNotNull($model->type);
- $this->assertNotNull($model->string);
- $this->assertNotNull($model->ordering);
- $this->assertTrue($model->save(), json_encode($model->getMessages()));
- }
-
- public function testValidationAppliedOnSave()
- {
- $model = factory(TuneSettingAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->save());
- }
-
- public function testTypeValidation()
- {
- $model = factory(TuneSettingAttribute::class)->make([]);
- $model->type = 'NotType';
-
- $this->assertFalse($model->validate());
- }
-
- public function testTuneSettingIdValidation()
- {
- $model = factory(TuneSettingAttribute::class)->make([]);
- $model->setting_id = Uuid::generate(4);
-
- $this->assertFalse($model->validate());
- }
-
- public function testStringValidation()
- {
- $longString = '';
- for ($i=0; $i < 300; $i++) {
- $longString .= 's';
- }
- $model = factory(TuneSettingAttribute::class)->make([]);
- $model->string = $longString;
-
- $this->assertFalse($model->validate());
- }
-
- public function testOrderingValidation()
- {
- $model = factory(TuneSettingAttribute::class)->make([]);
- $model->ordering = "fourth";
-
- $this->assertFalse($model->validate());
- }
-}
diff --git a/tests/unit/Laravel5/TuneSettingTest.php b/tests/unit/Laravel5/TuneSettingTest.php
deleted file mode 100644
index d3ed62f..0000000
--- a/tests/unit/Laravel5/TuneSettingTest.php
+++ /dev/null
@@ -1,328 +0,0 @@
-assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- }
-
- public function testMassAssignable()
- {
- $tune = factory(Tune::class)->create();
- $data = [
- 'tune_id' => $tune->id,
- 'meter' => 'C',
- 'keysig' => 'C',
- 'filename' => 'filename',
- 'tempo' => '1/8=200',
- 'L' => '1/8',
- 'music' => '',
- 'parts' => 'abcbc'
- ];
- $model = TuneSetting::create($data);
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($data['meter'], $model->meter);
- $this->assertEquals($data['keysig'], $model->keysig);
- $this->assertEquals($data['filename'], $model->filename);
- $this->assertEquals($data['tempo'], $model->tempo);
- $this->assertEquals($data['L'], $model->L);
- $this->assertEquals($data['music'], $model->music);
- $this->assertEquals($data['parts'], $model->parts);
- }
-
-
- public function testFactory()
- {
- $model = factory(TuneSetting::class)->make([]);
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertNotNull($model->tune_id);
- $this->assertNotNull($model->meter);
- $this->assertNotNull($model->keysig);
- }
-
- public function testValidationAppliedOnSave()
- {
- $model = factory(TuneSetting::class)->make([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $model->meter = 'NotType';
-
- $this->assertFalse($model->save());
- }
-
- public function testCanGetTranscriberAttribute()
- {
- $value = 'C';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Transcriber',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->Z[0]);
- }
-
- public function testSetTranscriberAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->Z = $values;
-
- $this->assertEquals($values[0], $model->Z[0]);
- $this->assertEquals($values[1], $model->Z[1]);
- }
-
- public function testTranscriberAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->Z = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->Z[0]);
- $this->assertEquals($values[1], $model->Z[1]);
- }
-
- public function testCanGetNoteAttribute()
- {
- $value = 'A note';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Note',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->N[0]);
- }
-
- public function testSetNoteAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->N = $values;
-
- $this->assertEquals($values[0], $model->N[0]);
- $this->assertEquals($values[1], $model->N[1]);
- }
-
- public function testNoteAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->N = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->N[0]);
- $this->assertEquals($values[1], $model->N[1]);
- }
-
- public function testCanGetDiscographyAttribute()
- {
- $value = 'A recording';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Discography',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->D[0]);
- }
-
- public function testSetDiscographyAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->D = $values;
-
- $this->assertEquals($values[0], $model->D[0]);
- $this->assertEquals($values[1], $model->D[1]);
- }
-
- public function testDiscographyAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->D = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->D[0]);
- $this->assertEquals($values[1], $model->D[1]);
- }
-
- public function testCanGetSourceAttribute()
- {
- $value = 'A feel';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Source',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->S[0]);
- }
-
- public function testSetSourceAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->S = $values;
-
- $this->assertEquals($values[0], $model->S[0]);
- $this->assertEquals($values[1], $model->S[1]);
- }
-
- public function testSourceAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->S = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->S[0]);
- $this->assertEquals($values[1], $model->S[1]);
- }
-
- public function testCanGetWordAttribute()
- {
- $value = 'A feel';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Word',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->W[0]);
- }
-
- public function testSetWordAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->W = $values;
-
- $this->assertEquals($values[0], $model->W[0]);
- $this->assertEquals($values[1], $model->W[1]);
- }
-
- public function testWordAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->W = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->W[0]);
- $this->assertEquals($values[1], $model->W[1]);
- }
-
- public function testCanGetBookAttribute()
- {
- $value = 'A feel';
- $model = factory(TuneSetting::class)->create([]);
- $attr = factory(TuneSettingAttribute::class)->create([
- 'setting_id' => $model->id,
- 'type' => 'Book',
- 'string' => $value,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(TuneSetting::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($value, $model->B[0]);
- }
-
- public function testSetBookAttribute()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->B = $values;
-
- $this->assertEquals($values[0], $model->B[0]);
- $this->assertEquals($values[1], $model->B[1]);
- }
-
- public function testBookAttributeSaves()
- {
- $values = ['Me', 'Womble2'];
- $model = factory(TuneSetting::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->B = $values;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($values[0], $model->B[0]);
- $this->assertEquals($values[1], $model->B[1]);
- }
-
-}
diff --git a/tests/unit/Laravel5/TuneTest.php b/tests/unit/Laravel5/TuneTest.php
deleted file mode 100644
index d5989a7..0000000
--- a/tests/unit/Laravel5/TuneTest.php
+++ /dev/null
@@ -1,270 +0,0 @@
-assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- }
-
- public function testMassAssignable()
- {
- $xId = 44;
- $model = Tune::create([
- 'x_id' => $xId,
- ]);
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($xId, $model->x_id);
- }
-
-
- public function testFactory()
- {
- $model = factory(Tune::class)->make([]);
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertNotNull($model->x_id);
- }
-
- public function testCanGetTitleAttribute()
- {
- $title = 'Wombles Forever';
- $model = factory(Tune::class)->create([]);
- $attr = factory(TuneAttribute::class)->create([
- 'tune_id' => $model->id,
- 'type' => 'Title',
- 'string' => $title,
- ]);
-
- $model = $model->fresh();
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($title, $model->T[0]);
- }
-
- public function testSetTitleAttribute()
- {
- $titles = ['Title1', 'Womble2'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->T = $titles;
-
- $this->assertEquals($titles[0], $model->T[0]);
- $this->assertEquals($titles[1], $model->T[1]);
- }
-
- public function testTitleAttributeSaves()
- {
- $titles = ['Title1', 'Womble2'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->T = $titles;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($titles[0], $model->T[0]);
- $this->assertEquals($titles[1], $model->T[1]);
- }
-
- public function testCanGetGroupAttribute()
- {
- $group = 'Flute';
- $model = factory(Tune::class)->create([]);
- $attr = factory(TuneAttribute::class)->create([
- 'tune_id' => $model->id,
- 'type' => 'Group',
- 'string' => $group,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($group, $model->G[0]);
- }
-
- public function testSetGroupAttribute()
- {
- $groups = ['Flute', 'Oboe'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->G = $groups;
-
- $this->assertEquals($groups[0], $model->G[0]);
- $this->assertEquals($groups[1], $model->G[1]);
- }
-
- public function testGroupAttributeSaves()
- {
- $groups = ['Flute', 'Oboe'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->G = $groups;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($groups[0], $model->G[0]);
- $this->assertEquals($groups[1], $model->G[1]);
- }
-
- public function testCanGetOriginAttribute()
- {
- $origin = 'England';
- $model = factory(Tune::class)->create([]);
- $attr = factory(TuneAttribute::class)->create([
- 'tune_id' => $model->id,
- 'type' => 'Origin',
- 'string' => $origin,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($origin, $model->O[0]);
- }
-
- public function testSetOriginAttribute()
- {
- $origins = ['England', 'Scotland'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->O = $origins;
-
- $this->assertEquals($origins[0], $model->O[0]);
- $this->assertEquals($origins[1], $model->O[1]);
- }
-
- public function testOriginAttributeSaves()
- {
- $origins = ['England', 'Scotland'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->O = $origins;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($origins[0], $model->O[0]);
- $this->assertEquals($origins[1], $model->O[1]);
- }
-
- public function testCanGetRhythmAttribute()
- {
- $rhythm = 'Reel';
- $model = factory(Tune::class)->create([]);
- $attr = factory(TuneAttribute::class)->create([
- 'tune_id' => $model->id,
- 'type' => 'Rhythm',
- 'string' => $rhythm,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($rhythm, $model->R[0]);
- }
-
- public function testSetRhythmAttribute()
- {
- $rhythms = ['Reel', 'March'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->R = $rhythms;
-
- $this->assertEquals($rhythms[0], $model->R[0]);
- $this->assertEquals($rhythms[1], $model->R[1]);
- }
-
- public function testRhythmAttributeSaves()
- {
- $rhythms = ['England', 'Scotland'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->R = $rhythms;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($rhythms[0], $model->R[0]);
- $this->assertEquals($rhythms[1], $model->R[1]);
- }
-
- public function testCanGetHistoryAttribute()
- {
- $history = 'England';
- $model = factory(Tune::class)->create([]);
- $attr = factory(TuneAttribute::class)->create([
- 'tune_id' => $model->id,
- 'type' => 'History',
- 'string' => $history,
- ]);
- $model = $model->fresh();
-
- $this->assertInstanceOf(Tune::class, $model);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $this->assertEquals($history, $model->H[0]);
- }
-
- public function testSetHistoryAttribute()
- {
- $history = ['some ', 'lines'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->H = $history;
-
- $this->assertEquals($history[0], $model->H[0]);
- $this->assertEquals($history[1], $model->H[1]);
- }
-
-
- public function testHistoryAttributeSaved()
- {
- $history = ['some ', 'lines'];
- $model = factory(Tune::class)->create([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
-
- $model->H = $history;
- $model->save();
- $model = $model->fresh();
-
- $this->assertEquals($history[0], $model->H[0]);
- $this->assertEquals($history[1], $model->H[1]);
- }
-
- public function testValidationAppliedOnSave()
- {
- $model = factory(Tune::class)->make([]);
- $this->assertEmpty($model->getMessages(), json_encode($model->getMessages()));
- $model->x_id = 'NotType';
-
- $this->assertFalse($model->save());
- }
-
-}
diff --git a/tests/unit/Laravel5/factories/ModelFactory.php b/tests/unit/Laravel5/factories/ModelFactory.php
deleted file mode 100644
index 63caa6d..0000000
--- a/tests/unit/Laravel5/factories/ModelFactory.php
+++ /dev/null
@@ -1,56 +0,0 @@
-define(\XaiCorp\AbcParser\Models\Laravel5\Collection::class, function (Faker\Generator $faker) {
- return [
- 'name' => $faker->name,
- ];
-});
-
-$factory->define(\XaiCorp\AbcParser\Models\Laravel5\Tune::class, function (Faker\Generator $faker) {
- return [
- 'x_id' => $faker->numberBetween(1, 10),
- ];
-});
-
-$factory->define(\XaiCorp\AbcParser\Models\Laravel5\Person::class, function (Faker\Generator $faker) {
- return [
- 'name' => $faker->name,
- 'email'=> $faker->safeEmail,
- ];
-});
-
-$factory->define(\XaiCorp\AbcParser\Models\Laravel5\TuneAttribute::class, function (Faker\Generator $faker) {
- $types = \XaiCorp\AbcParser\Models\Laravel5\TuneAttribute::getTypes();
- return [
- 'tune_id' => function () {
- return factory(\XaiCorp\AbcParser\Models\Laravel5\Tune::class)->create()->id;
- },
- 'type' => $types[random_int(0, count($types)-1)],
- 'string' => $faker->words(3, true),
- 'ordering' => $faker->numberBetween(1, 5),
- ];
-});
-
-
-$factory->define(\XaiCorp\AbcParser\Models\Laravel5\CollectionAttribute::class, function (Faker\Generator $faker) {
- $types = \XaiCorp\AbcParser\Models\Laravel5\CollectionAttribute::getTypes();
- return [
- 'collection_id' => function () {
- return factory(\XaiCorp\AbcParser\Models\Laravel5\Collection::class)->create()->id;
- },
- 'type' => $types[random_int(0, count($types)-1)],
- 'string' => $faker->words(3, true),
- 'ordering' => $faker->numberBetween(1, 5),
- ];
-});
diff --git a/tests/unit/Laravel5/factories/TuneSettingFactory.php b/tests/unit/Laravel5/factories/TuneSettingFactory.php
deleted file mode 100644
index 2682e8f..0000000
--- a/tests/unit/Laravel5/factories/TuneSettingFactory.php
+++ /dev/null
@@ -1,24 +0,0 @@
-define(\XaiCorp\AbcParser\Models\Laravel5\TuneSetting::class, function (Faker\Generator $faker) {
- return [
- 'tune_id' => function () {
- return factory(\XaiCorp\AbcParser\Models\Laravel5\Tune::class)->create()->id;
- },
- 'meter' => 'C',
- 'keysig' => '6/8',
- ];
-});
-
-$factory->define(\XaiCorp\AbcParser\Models\Laravel5\TuneSettingAttribute::class, function (Faker\Generator $faker) {
- $types = \XaiCorp\AbcParser\Models\Laravel5\TuneSettingAttribute::getTypes();
- return [
- 'setting_id' => function () {
- return factory(\XaiCorp\AbcParser\Models\Laravel5\TuneSetting::class)->create()->id;
- },
- 'type' => $types[random_int(0, count($types)-1)],
- 'string' => $faker->words(3, true),
- 'ordering' => $faker->numberBetween(1, 5),
- ];
-});
diff --git a/tests/unit/AbcParserCest.php b/tests/unit/ParserCest.php
similarity index 94%
rename from tests/unit/AbcParserCest.php
rename to tests/unit/ParserCest.php
index 64e6dea..4f4f423 100644
--- a/tests/unit/AbcParserCest.php
+++ b/tests/unit/ParserCest.php
@@ -1,10 +1,12 @@
mock();
$parser = new Parser($builder);
-
+
$I->assertInstanceOf(Parser::class, $parser);
}
@@ -62,6 +64,7 @@ class AbcParserCest
->shouldReceive('newTune')->once()
->shouldReceive('newSetting')->once()
->shouldReceive('appendToSetting')->once()
+ ->shouldReceive('setOnSetting')->once()
->shouldReceive('storeTune')->once()
->shouldreceive('getCollection')->once()->andreturn(true);
$builder->shouldReceive('setOnTune')
diff --git a/tests/unit/Laravel5/AbcParserCest.php b/tests/unit/arr/AbcCest.php
similarity index 58%
rename from tests/unit/Laravel5/AbcParserCest.php
rename to tests/unit/arr/AbcCest.php
index fd02d23..1be0e26 100644
--- a/tests/unit/Laravel5/AbcParserCest.php
+++ b/tests/unit/arr/AbcCest.php
@@ -1,11 +1,12 @@
dataDir.'/abc/valid_abc_1.abc');
+ $abc = file_get_contents($this->dataDir . '/abc/valid_abc_1.abc');
$parser = new Parser($this->builder);
$expected = [
1 => [
- 'X' => '3',
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
+ 'X' => '3',
+ 'M' => '4/4',
+ 'K' => 'C',
+ 'music' => 'gaab babc :|',
],
];
$result = $parser->parseABC($abc);
$I->assertNotEmpty($result);
- $resultArray = $result->toArray();
- $I->assertEquals($expected, $resultArray);
+ $I->assertEquals($expected, $result);
}
public function seeParseABCExample2(UnitTester $I)
{
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_2.abc');
+ $abc = file_get_contents($this->dataDir . '/abc/valid_abc_2.abc');
$parser = new Parser($this->builder);
$expected = [
1 => [
- 'X' => '40',
- 'T' => ['Abbotts Bromley Horn Dance'],
- 'A' => ['trad'],
- 'C' => ['trad.'],
- 'D' => ['None'],
- 'G' => ['lute'],
- 'H' => [
+ 'X' => '40',
+ 'T' => ['Abbotts Bromley Horn Dance'],
+ 'A' => ['trad'],
+ 'C' => ['trad.'],
+ 'D' => ['None'],
+ 'G' => ['lute'],
+ 'H' => [
'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
+ 'The Horns live in the church and are removed for the dance once a year',
],
- 'R' => ['Jig'],
- 'F' => ['none.abc'],
- 'B' => ['Traditional English tunes'],
- 'W' => ['None'],
- 'Q' => '1/8=80',
- 'L' => '1/8',
- 'M' => '6/8',
- 'N' => ['Traditional English'],
- 'O' => ['England'],
- 'Z' => ['Andy Hornby'],
- 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
- 'P' => 'ABC',
- 'K' => 'G',
+ 'R' => ['Jig'],
+ 'F' => ['none.abc'],
+ 'B' => ['Traditional English tunes'],
+ 'W' => ['None'],
+ 'Q' => '1/8=80',
+ 'L' => '1/8',
+ 'M' => '6/8',
+ 'N' => ['Traditional English'],
+ 'O' => ['England'],
+ 'Z' => ['Andy Hornby'],
+ 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
+ 'P' => 'ABC',
+ 'K' => 'G',
'music' => 'e|B2e G2e|B2e E2G|FGA GAB|1AGF G2:|2AGF E2|
|e|c2e cde|A2c ABc|FGA GFE|_E=EF B,2g|
e2g efg|c2e cde|dcB AGF|E3E2
-|:A|BcB e3|BcB f3|BcB AGF|1G2F G2:|2E3-E2|]'
+|:A|BcB e3|BcB f3|BcB AGF|1G2F G2:|2E3-E2|]',
],
];
$result = $parser->parseABC($abc);
$I->assertNotEmpty($result);
- $resultArray = $result->toArray();
- $I->assertEquals($expected, $resultArray);
+ $I->assertEquals($expected, $result);
}
public function seeParseABCExample3(UnitTester $I)
{
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_3.abc');
+ $abc = file_get_contents($this->dataDir . '/abc/valid_abc_3.abc');
$parser = new Parser($this->builder);
$expected = [
'A' => ['trad'],
@@ -128,7 +127,7 @@ e2g efg|c2e cde|dcB AGF|E3E2
'D' => ['None'],
'H' => [
'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
+ 'The Horns live in the church and are removed for the dance once a year',
],
'R' => ['Jig'],
'F' => ['none.abc'],
@@ -141,17 +140,17 @@ e2g efg|c2e cde|dcB AGF|E3E2
'Z' => ['Andy Hornby'],
1 => [
- 'X' => '3',
- 'T' => ['Short and Sweet'],
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
- ]
+ 'X' => '3',
+ 'M' => '4/4',
+ 'K' => 'C',
+ 'music' => 'gaab babc :|',
+ 'T' => ['Short and Sweet']
+ ],
];
$result = $parser->parseABC($abc);
- $I->assertNotEmpty($result->toArray());
+ $I->assertNotEmpty($result);
- $I->assertEquals($expected, $result->toArray());
+ $I->assertEquals($expected, $result);
}
}
diff --git a/tests/unit/arr/AbcParserCest.php b/tests/unit/arr/AbcParserCest.php
deleted file mode 100644
index 8159f76..0000000
--- a/tests/unit/arr/AbcParserCest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-dataDir = codecept_data_dir();
- }
-
- public function _before(UnitTester $I)
- {
- $this->builder = new Abc();
- }
-
- public function _after(UnitTester $I)
- {
- unset($builder);
- }
-
- // tests: trying to...
- public function createParser(UnitTester $I)
- {
- $parser = new Parser($this->builder);
-
- $I->assertInstanceOf(Parser::class, $parser);
- }
-
- public function seeParseEmptyAbcWithoutErrors(UnitTester $I)
- {
- $abc = '';
- $parser = new Parser($this->builder);
-
- $result = $parser->parseABC($abc);
- $I->assertEmpty($result);
- }
-
- public function seeParseABCExample1(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_1.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 1 => [
- 'X' => '3',
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
- ],
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-
- public function seeParseABCExample2(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_2.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 1 => [
- 'X' => '40',
- 'T' => ['Abbotts Bromley Horn Dance'],
- 'A' => ['trad'],
- 'C' => ['trad.'],
- 'D' => ['None'],
- 'G' => ['lute'],
- 'H' => [
- 'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
- ],
- 'R' => ['Jig'],
- 'F' => ['none.abc'],
- 'B' => ['Traditional English tunes'],
- 'W' => ['None'],
- 'Q' => '1/8=80',
- 'L' => '1/8',
- 'M' => '6/8',
- 'N' => ['Traditional English'],
- 'O' => ['England'],
- 'Z' => ['Andy Hornby'],
- 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
- 'P' => 'ABC',
- 'K' => 'G',
- 'music' => 'e|B2e G2e|B2e E2G|FGA GAB|1AGF G2:|2AGF E2|
-|e|c2e cde|A2c ABc|FGA GFE|_E=EF B,2g|
-e2g efg|c2e cde|dcB AGF|E3E2
-|:A|BcB e3|BcB f3|BcB AGF|1G2F G2:|2E3-E2|]'
- ],
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-
-
- public function seeParseABCExample3(UnitTester $I)
- {
- $abc = file_get_contents($this->dataDir.'/abc/valid_abc_3.abc');
- $parser = new Parser($this->builder);
- $expected = [
- 'A' => ['trad'],
- 'C' => ['trad.'],
- 'D' => ['None'],
- 'H' => [
- 'Thousand year old tradition',
- 'The Horns live in the church and are removed for the dance once a year'
- ],
- 'R' => ['Jig'],
- 'F' => ['none.abc'],
- 'B' => ['Traditional English tunes'],
- 'L' => '1/8',
- 'M' => '6/8',
- 'N' => ['Traditional English'],
- 'O' => ['England'],
- 'S' => ['http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html'],
- 'Z' => ['Andy Hornby'],
-
- 1 => [
- 'X' => '3',
- 'M' => '4/4',
- 'K' => 'C',
- 'music' => 'gaab babc :|'
- ]
- ];
-
- $result = $parser->parseABC($abc);
- $I->assertNotEmpty($result);
-
- $I->assertEquals($expected, $result);
- }
-}
diff --git a/tests/unit/memory/AbcParserTest.php b/tests/unit/memory/AbcParserTest.php
index da20ed8..5ccf6a0 100644
--- a/tests/unit/memory/AbcParserTest.php
+++ b/tests/unit/memory/AbcParserTest.php
@@ -1,158 +1,100 @@
_facade = new AbcParser();
+ $this->facade = new AbcParser(new Abc());
}
- public function test_not_header_data_no_crash()
+ private function getValidAbc($filename = '/abc/valid_abc_1.abc')
{
- $result = $this->_facade->parseABC($this->valid_abc_1);
- $this->assertTrue(is_a($result, 'App\Libraries\abcParse\TuneCollection'));
+ return file_get_contents(codecept_data_dir($filename));
+ }
+
+ public function testNotHeaderDataNoCrash()
+ {
+ $result = $this->facade->parseABC($this->getValidAbc());
+ $this->assertInstanceOf(\XaiCorp\AbcParser\Models\Memory\TuneCollection::class, $result);
}
- public function test_all_parameters_for_tune()
+ public function testAllParametersForTune()
{
- $result = $this->_facade->parseABC($this->valid_abc_2);
- $this->assertTrue(is_a($result, 'App\Libraries\abcParse\TuneCollection'));
+ $result = $this->facade->parseABC($this->getValidAbc('/abc/valid_abc_2.abc'));
- // Tune details
+ // Tune details
$tune = $result[0];
- // var_dump($tune); die();
$this->assertEquals('40', $result[0]->get('X'));
- $this->assertEquals('Abbotts Bromley Horn Dance', array_shift($tune->get('T')) );
- $this->assertEquals('England', array_shift($tune->get('O')) );
- $this->assertEquals(new App\Libraries\abcParse\Person(array('name'=>'trad')), array_shift($tune->get('A')) );
- $this->assertEquals(new App\Libraries\abcParse\Person(array('name'=>'trad.')), array_shift($tune->get('C')) );
- $this->assertEquals('England', array_shift($tune->get('O')) );
- $this->assertEquals('lute', array_shift($tune->get('G')) );
+ $this->assertEquals('Abbotts Bromley Horn Dance', current($tune->get('T')));
+ $this->assertEquals('England', current($tune->get('O')));
+ $this->assertEquals(new Person(['name' => 'trad']), current($tune->get('A')));
+ $this->assertEquals(new Person(['name' => 'trad.']), current($tune->get('C')));
+ $this->assertEquals('England', current($tune->get('O')));
+ $this->assertEquals('lute', current($tune->get('G')));
$history = $tune->get('H');
$this->assertEquals(2, count($history));
- $this->assertEquals('Thousand year old tradition', $history[0] );
- $this->assertEquals('The Horns live in the church and are removed for the dance once a year', $history[1] );
- $this->assertEquals('Jig', array_shift($tune->get('R')) );
+ $this->assertEquals('Thousand year old tradition', $history[0]);
+ $this->assertEquals('The Horns live in the church and are removed for the dance once a year', $history[1]);
+ $this->assertEquals('Jig', current($tune->get('R')));
// setting details
$setting = $tune[0];
- // var_dump($setting);die;
- $this->assertEquals('Traditional English', array_shift($setting->get('N')) );
- $this->assertEquals('1/8', $setting->get('L') );
- $this->assertEquals('6/8', $setting->get('M') );
- $this->assertEquals('G', $setting->get('K') );
+ $this->assertEquals('Traditional English', current($setting->get('N')));
+ $this->assertEquals('1/8', $setting->get('L'));
+ $this->assertEquals('6/8', $setting->get('M'));
+ $this->assertEquals('G', $setting->get('K'));
$expectedMusic = "
e|B2e G2e|B2e E2G|FGA GAB|1AGF G2:|2AGF E2|
|e|c2e cde|A2c ABc|FGA GFE|_E=EF B,2g|
e2g efg|c2e cde|dcB AGF|E3E2
|:A|BcB e3|BcB f3|BcB AGF|1G2F G2:|2E3-E2|]
";
- $this->assertEquals(trim($expectedMusic), $setting->get('music'), "music strings should match" );
+ $this->assertEquals(trim($expectedMusic), $setting->get('music'), "music strings should match");
- $Z = new App\Libraries\abcParse\Person(array('name'=>'Andy Hornby'));
- $this->assertEquals($Z, array_shift($setting->get('Z')) );
+ $Z = new Person(['name' => 'Andy Hornby']);
+ $this->assertEquals($Z, current($setting->get('Z')));
- $this->assertEquals('None', array_shift($setting->get('D')) );
- $this->assertEquals('http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html', array_shift($setting->get('S')) );
- $this->assertEquals('None', array_shift($setting->get('W')) );
- $this->assertEquals('Traditional English tunes', array_shift($setting->get('B')) );
- $this->assertEquals('none.abc', array_shift($setting->get('F')) );
- $this->assertEquals('ABC', $setting->get('P') );
- $this->assertEquals('1/8=80', $setting->get('Q') );
+ $this->assertEquals('None', current($setting->get('D')));
+ $this->assertEquals(
+ 'http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html',
+ current($setting->get('S'))
+ );
+ $this->assertEquals('None', current($setting->get('W')));
+ $this->assertEquals('Traditional English tunes', current($setting->get('B')));
+ $this->assertEquals('none.abc', current($setting->get('F')));
+ $this->assertEquals('ABC', $setting->get('P'));
+ $this->assertEquals('1/8=80', $setting->get('Q'));
}
- public function test_all_parameters_for_collection()
+ public function testAllParametersForCollection()
{
- $collection = $this->_facade->parseABC($this->valid_abc_3);
- $this->assertTrue(is_a($collection, 'App\Libraries\abcParse\TuneCollection'));
+ $collection = $this->facade->parseABC($this->getValidAbc('/abc/valid_abc_3.abc'));
- $this->assertEquals(new App\Libraries\abcParse\Person(array('name'=>'trad')), array_shift($collection->get('A')) );
- $this->assertEquals('Traditional English tunes', array_shift($collection->get('B')) );
- $this->assertEquals(new App\Libraries\abcParse\Person(array('name'=>'trad.')), array_shift($collection->get('C')) );
- $this->assertEquals('None', array_shift($collection->get('D')) );
- $this->assertEquals('none.abc', array_shift($collection->get('F')) );
- $this->assertEquals('Thousand year old tradition', array_shift($collection->get('H')) );
- $this->assertEquals('1/8', $collection->get('L') );
- $this->assertEquals('6/8', $collection->get('M') );
- $this->assertEquals('Traditional English', array_shift($collection->get('N')) );
- $this->assertEquals('England', array_shift($collection->get('O')) );
- $this->assertEquals('Jig', $collection->get('R') );
- $this->assertEquals('http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html', array_shift($collection->get('S')) );
- $this->assertEquals(new App\Libraries\abcParse\Person(array('name'=>'Andy Hornby')), array_shift($collection->get('Z')) );
+ $this->assertEquals(new Person(['name' => 'trad']), current($collection->get('A')));
+ $this->assertEquals('Traditional English tunes', current($collection->get('B')));
+ $this->assertEquals(new Person(['name' => 'trad.']), current($collection->get('C')));
+ $this->assertEquals('None', current($collection->get('D')));
+ $this->assertEquals('none.abc', current($collection->get('F')));
+ $this->assertEquals('Thousand year old tradition', current($collection->get('H')));
+ $this->assertEquals('1/8', $collection->get('L'));
+ $this->assertEquals('6/8', $collection->get('M'));
+ $this->assertEquals('Traditional English', current($collection->get('N')));
+ $this->assertEquals('England', current($collection->get('O')));
+ $this->assertEquals('Jig', $collection->get('R'));
+ $this->assertEquals(
+ 'http://www.leeds.ac.uk/music/Info/RRTuneBk/gettune/00000dab.html',
+ current($collection->get('S'))
+ );
+ $this->assertEquals(new Person(['name' => 'Andy Hornby']), current($collection->get('Z')));
}
}
diff --git a/tests/unit/memory/PabcTest.php b/tests/unit/memory/PabcTest.php
deleted file mode 100644
index 72799d9..0000000
--- a/tests/unit/memory/PabcTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-_facade = new Pabc();
- }
-
- private $valid_abc_1 = "
-X:1
-M:C
-K:C
-gaab babc :|
- ";
-
-
- /**
- * test the parse_abc function
- *
- * This method receives abc in a string
- * and converts it into a Tune object.
- * If the string is not valid abc no Tune object is created
- * and the method returns false.
- *
- * @dataProvider provider_parse_abc
- */
- public function test_parse_abc($string, $isValid)
- {
- $result = $this->_facade->parse_abc($string);
- $this->assertEquals($isValid, is_a($result, TuneCollection::class));
- }
-
- public function provider_parse_abc()
- {
- return array(
- array('not an abc', FALSE),
- array($this->valid_abc_1, TRUE),
- );
- }
-
-
- public function test_load_models()
- {
- $params = array(
- 'tuneModel' => new Tune(),
- 'settingModel' => new Setting(),
- 'personModel' => new Person(),
- );
-
- $this->_facade = new Pabc($params);
-
- $this->assertInstanceOf(Tune::class, $this->_facade->tuneModel);
- $this->assertInstanceOf(Setting::class, $this->_facade->settingModel);
- $this->assertInstanceOf(Person::class, $this->_facade->personModel);
- }
-
-
- public function test_save_no_models()
- {
- $this->assertNull($this->_facade->tuneModel);
-
- $result = $this->_facade->parse_abc($this->valid_abc_1);
- $this->assertInstanceOf(TuneCollection::class, $result);
-
- $this->assertFalse($result->get('change_hash'));
- $saved = $this->_facade->save_collection($result);
- $this->assertFalse($saved);
- $this->assertFalse($result->get('change_hash'));
- }
-
- public function test_save()
- {
- $params = array(
- 'tuneModel' => Mockery::mock(Tune::Class, ['store'=>true]),
- 'settingModel' => Mockery::mock(Setting::class, ['store'=>true]),
- 'personModel' => Mockery::mock(Person::class, ['store'=>true]),
- );
-
- $this->_facade = new Pabc($params);
-
- $result = $this->_facade->parse_abc($this->valid_abc_1);
- $this->assertInstanceOf(TuneCollection::class, $result);
-
- $this->assertFalse($result->get('change_hash'));
- $saved = $this->_facade->save_collection($result);
- $this->assertTrue($saved);
- $this->assertNotNull($result->get('change_hash'));
- }
-
-}
\ No newline at end of file
diff --git a/tests/unit/memory/PersonTest.php b/tests/unit/memory/PersonTest.php
index 0ccb41b..ffd6b34 100644
--- a/tests/unit/memory/PersonTest.php
+++ b/tests/unit/memory/PersonTest.php
@@ -1,40 +1,44 @@
_person = new Person();
+ $this->person = new Person();
}
/**
* test the model contains the correct attributes
*/
- public function test_model_definition()
+ public function testModelDefinition()
{
$this->assertClassHasAttribute('person_id', Person::class);
$this->assertClassHasAttribute('name', Person::class);
$this->assertClassHasAttribute('email', Person::class);
}
- public function test_construct()
+ public function testConstruct()
{
- $params = array('person_id' => 5);
- $this->_person = new Person($params);
+ $params = ['person_id' => 5];
+ $this->person = new Person($params);
- $this->assertEquals(5, $this->_person->get('person_id'));
+ $this->assertEquals(5, $this->person->get('person_id'));
}
+ /**
+ * @dataProvider providerSet
+ */
+ public function testMagicSet($property, $value, $expected)
+ {
+ $this->testSet($property, $value, $expected);
+ }
/**
* test the set property method
@@ -43,74 +47,65 @@ class PersonTest extends Test
* @param (mixed) value to set
* @param (Boolean) expected value for return value of set method
*
- * @dataProvider provider_set
+ * @dataProvider providerSet
*/
- public function test_set($property, $value, $expected)
+ public function testSet($property, $value, $expected)
{
- $success = $this->_person->set($property, $value);
+ $success = $this->person->set($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertEquals($value, $this->_person->get($property));
+ if ($success) {
+ $this->assertEquals($value, $this->person->get($property));
}
}
- /**
- * @dataProvider provider_set
- */
- public function test_magic_set($property, $value, $expected)
+ public function providerSet()
{
- $this->test_set($property, $value, $expected);
- }
-
- public function provider_set()
- {
- return array(
- array('Y', 'anything', FALSE),
- array('person_id', 'not', FALSE),
- array('person_id', 11, TRUE),
- array('person_id', '11', TRUE),
- array('name', null, FALSE),
- array('name', 1, FALSE),
- array('name', 'anything', TRUE),
- array('email', 'anything', FALSE),
- array('email', 1, FALSE),
- array('email', 'mail@example.com', TRUE),
- );
+ return [
+ ['Y', 'anything', false],
+ ['person_id', 'not', false],
+ ['person_id', 11, true],
+ ['person_id', '11', true],
+ ['name', null, false],
+ ['name', 1, false],
+ ['name', 'anything', true],
+ ['email', 'anything', false],
+ ['email', 1, false],
+ ['email', 'mail@example.com', true],
+ ];
}
/**
- * @dataProvider provider_person_get
+ * @dataProvider providerPersonGet
*/
- public function test_person_get($key, $expected)
+ public function testPersonGet($key, $expected)
{
- $result = $this->_person->set($key, $expected);
- $result = $this->_person->get($key);
+ $result = $this->person->set($key, $expected);
+ $result = $this->person->get($key);
$this->assertEquals($expected, $result);
}
- public function provider_person_get()
+ public function providerPersonGet()
{
- return array(
- array('', FALSE),
- array('me', FALSE),
- array(array('of','me'), FALSE),
- array(new Person(), FALSE),
- array('name', 'Richard Morgan'),
- array('email', 'r_morgan@sympatico.ca'),
- array('person_id', 0)
- );
+ return [
+ ['', false],
+ ['me', false],
+ [['of', 'me'], false],
+ [new Person(), false],
+ ['name', 'Richard Morgan'],
+ ['email', 'r_morgan@sympatico.ca'],
+ ['person_id', 0],
+ ];
}
- public function test_is_changed()
+ public function testIsChanged()
{
- $person = new Person(array('name'=>'Richard Morgan'));
+ $person = new Person(['name' => 'Richard Morgan']);
$this->assertInstanceOf(Person::class, $person);
$this->assertFalse($person->is_changed(), 'after load should be no changes');
- $person->set('name','Richard Armitage');
+ $person->set('name', 'Richard Armitage');
$this->assertTrue($person->is_changed(), 'updating the name changes the data');
}
@@ -122,23 +117,18 @@ class PersonTest extends Test
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
*
- * @dataProvider provider_equals
+ * @dataProvider providerEquals
*/
- public function test_equals($params)
+ public function testEquals($params)
{
- // $this->markTestIncomplete();
-
$ob1 = new Person();
$ob2 = new Person();
- foreach($params as $key => $val)
- {
- if(is_array($ob1->get($key)))
- {
+ foreach ($params as $key => $val) {
+ if (is_array($ob1->get($key))) {
$ob1->append($key, $val);
$ob2->append($key, $val);
- }
- else {
+ } else {
$ob1->set($key, $val);
$ob2->set($key, $val);
}
@@ -146,6 +136,7 @@ class PersonTest extends Test
$this->assertTrue(Person::equals($ob1, $ob2));
}
+
/**
* test the static function equals
* returns true if the data properties of 2 Person objects
@@ -154,36 +145,32 @@ class PersonTest extends Test
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
*
- * @dataProvider provider_equals
+ * @dataProvider providerEquals
*/
- public function test_equals_fails($params)
+ public function testEqualsFails($params)
{
$ob1 = new Person();
$ob2 = new Person();
- foreach($params as $key => $val)
- {
- if(is_array($ob1->get($key)))
- {
+ foreach ($params as $key => $val) {
+ if (is_array($ob1->get($key))) {
$ob1->append($key, $val);
- $ob2->append($key, $val." hello");
- }
- else {
+ $ob2->append($key, $val . " hello");
+ } else {
$ob1->set($key, $val);
- $ob2->set($key, $val+1);
+ $ob2->set($key, $val + 1);
}
}
// print_r($ob1); print_r($ob2); die;
$this->assertFalse(Person::equals($ob1, $ob2));
}
- public function provider_equals()
+
+ public function providerEquals()
{
- return array(
+ return [
// array( array('person_id'=>'2') ),
- array( array('name'=>'a title') ),
- array( array('email'=>'mail@example.com') ),
- );
+ [['name' => 'a title']],
+ [['email' => 'mail@example.com']],
+ ];
}
-
-
}
diff --git a/tests/unit/memory/SettingTest.php b/tests/unit/memory/SettingTest.php
index 33cdf86..6ea796a 100644
--- a/tests/unit/memory/SettingTest.php
+++ b/tests/unit/memory/SettingTest.php
@@ -1,30 +1,30 @@
_setting = new Setting();
- }
-
+ private $setting;
+
+ public function setUp()
+ {
+ $this->setting = new Setting();
+ }
+
/**
* test the model contains the correct attributes
*/
- public function test_model_definition()
- {
+ public function testModelDefinition()
+ {
$this->assertClassHasAttribute('settingID', Setting::class);
$this->assertClassHasAttribute('tuneID', Setting::class);
-
+
$this->assertClassHasAttribute('Z', Setting::class);
$this->assertClassHasAttribute('N', Setting::class);
$this->assertClassHasAttribute('D', Setting::class);
@@ -42,323 +42,313 @@ class SettingTest extends TestCase
// $this->assertClassHasAttribute('music_hash', Setting::class);
$this->assertClassHasAttribute('propertyNames', Setting::class);
- }
+ }
/**
* test the set property method
- *
+ *
* also tests the validate_line protected method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to set
* @param (Boolean) expected value for return value of set method
- *
- * @dataProvider provider_set
+ *
+ * @dataProvider providerSet
*/
- public function test_set($property, $value, $expected_success, $expected_value = FALSE)
+ public function testSet($property, $value, $expected_success, $expected_value = false)
{
- $success = $this->_setting->set($property, $value);
+ $success = $this->setting->set($property, $value);
$this->assertEquals($expected_success, $success);
- if($success)
- {
- if(! $expected_value ) { $expected_value = $value; }
- $this->assertEquals($expected_value, $this->_setting->get($property));
+ if ($success) {
+ if (!$expected_value) {
+ $expected_value = $value;
+ }
+ $this->assertEquals($expected_value, $this->setting->get($property));
}
}
- /**
- * @dataProvider provider_set
- */
- public function test_magic_set($property, $value, $expected_success, $expected_value = FALSE)
- {
- $this->_setting->$property = $value;
- if($expected_success)
- {
- $this->assertEquals($value, $this->_setting->get($property));
- }
- }
-
- public function provider_set()
- {
- return array(
- array('Y', 'anything', FALSE),
- array('settingID', 1, TRUE),
- array('tuneID', array('alpha'), FALSE),
- array('tuneID', 'alpha', FALSE),
- array('tuneID', '1', TRUE),
- array('tuneID', 1, TRUE),
- array('f', 1, FALSE),
- array('F', 1, FALSE),
- array('F', '1',FALSE),
- array('F', array('aplha'), TRUE),
- array('P', array('string'), FALSE),
- array('P', 10, FALSE),
- array('P', 'string', TRUE),
- array('Q', array('string'), FALSE),
- array('Q', 10, FALSE),
- array('Q', 'string', FALSE),
- array('Q', '1/8=200', TRUE),
- array('L', array('string'), FALSE),
- array('L', 10, FALSE),
- array('L', 'string', FALSE),
- array('L', '1/8', TRUE),
- array('M', array('string'), FALSE),
- array('M', 10, FALSE),
- array('M', 'string', FALSE),
- array('M', '6/8', TRUE),
- array('M', 'C', TRUE),
- array('M', 'c', TRUE),
- array('M', 'C|', TRUE),
- array('K', array('string'), FALSE),
- array('K', 10, FALSE),
- array('K', 'C', TRUE),
- array('K', 'Am', TRUE),
- array('K', 'A minor', TRUE),
- array('K', 'E dorian', TRUE),
- array('music', 'GABc:|\\', TRUE),
- array('Z', new Person(), FALSE),
- array('Z', array(new Person(), 'not a person'), FALSE),
- array('Z', array(new Person()), TRUE),
- array('Z', 111, FALSE),
- array('N', array('a string'), TRUE),
- array('D', array('a string'), TRUE),
- array('S', array('a string'), TRUE),
- array('W', array('a string'), TRUE),
- array('B', array('a string'), TRUE),
- );
+ /**
+ * @dataProvider providerSet
+ */
+ public function testMagicSet($property, $value, $expected_success, $expected_value = false)
+ {
+ $this->setting->$property = $value;
+ if ($expected_success) {
+ $this->assertEquals($value, $this->setting->get($property));
+ }
}
-
+
+ public function providerSet()
+ {
+ return [
+ ['Y', 'anything', false],
+ ['settingID', 1, true],
+ ['tuneID', ['alpha'], false],
+ ['tuneID', 'alpha', false],
+ ['tuneID', '1', true],
+ ['tuneID', 1, true],
+ ['f', 1, false],
+ ['F', 1, false],
+ ['F', '1', false],
+ ['F', ['aplha'], true],
+ ['P', ['string'], false],
+ ['P', 10, false],
+ ['P', 'string', true],
+ ['Q', ['string'], false],
+ ['Q', 10, false],
+ ['Q', 'string', false],
+ ['Q', '1/8=200', true],
+ ['L', ['string'], false],
+ ['L', 10, false],
+ ['L', 'string', false],
+ ['L', '1/8', true],
+ ['M', ['string'], false],
+ ['M', 10, false],
+ ['M', 'string', false],
+ ['M', '6/8', true],
+ ['M', 'C', true],
+ ['M', 'c', true],
+ ['M', 'C|', true],
+ ['K', ['string'], false],
+ ['K', 10, false],
+ ['K', 'C', true],
+ ['K', 'Am', true],
+ ['K', 'A minor', true],
+ ['K', 'E dorian', true],
+ ['music', 'GABc:|\\', true],
+ ['Z', new Person(), false],
+ ['Z', [new Person(), 'not a person'], false],
+ ['Z', [new Person()], true],
+ ['Z', 111, false],
+ ['N', ['a string'], true],
+ ['D', ['a string'], true],
+ ['S', ['a string'], true],
+ ['W', ['a string'], true],
+ ['B', ['a string'], true],
+ ];
+ }
+
/**
* the settingID can only be set if it's value is currently 0
* this ensures that we can't change a setting's id once it's set.
* the default, unset value for settingID is 0
*/
- public function test_set_settingID()
+ public function testSetSettingID()
{
- $success = $this->_setting->set('settingID', 1);
+ $success = $this->setting->set('settingID', 1);
$this->assertTrue($success, 'first attempt should succeed');
-
- $success = $this->_setting->set('settingID', 2);
+
+ $success = $this->setting->set('settingID', 2);
$this->assertFalse($success, 'second attempt should fail');
}
-
-
+
+
/**
* test the append value method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to append
* @param (Boolean) expected value for return value of append method
- *
- * @dataProvider provider_append
+ *
+ * @dataProvider providerAppend
*/
- public function test_append($property, $value, $expected)
+ public function testAppend($property, $value, $expected)
{
- $success = $this->_setting->append($property, $value);
+ $success = $this->setting->append($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertContains($value, $this->_setting->get($property));
+ if ($success) {
+ $this->assertContains($value, $this->setting->get($property));
}
}
-
- public function provider_append()
- {
- return array(
- array('Y', 'anything', FALSE),
- array('settingID', 1, FALSE),
- array('tuneID', array('alpha'), FALSE),
- array('tuneID', 'alpha', FALSE),
- array('tuneID', '1', FALSE),
- array('tuneID', 1, FALSE),
- array('f', 1, FALSE),
- array('F', 1, TRUE),
- array('F', '1', TRUE),
- array('F', array('aplha'), FALSE),
- array('P', array('string'), FALSE),
- array('P', 10, FALSE),
- array('P', 'string', FALSE),
- array('Q', array('string'), FALSE),
- array('Q', 10, FALSE),
- array('Q', 'string', FALSE),
- array('Q', '1/8=200', FALSE),
- array('L', array('string'), FALSE),
- array('L', 10, FALSE),
- array('L', 'string', FALSE),
- array('L', '1/8', FALSE),
- array('M', array('string'), FALSE),
- array('M', 10, FALSE),
- array('M', 'string', FALSE),
- array('M', '6/8', FALSE),
- array('M', 'C', FALSE),
- array('M', 'c', FALSE),
- array('M', 'C|', FALSE),
- array('K', array('string'), FALSE),
- array('K', 10, FALSE),
- array('K', 'C', FALSE),
- array('K', 'Am', FALSE),
- array('K', 'A minor', FALSE),
- array('K', 'E dorian', FALSE),
- array('music', 'GABc:|\\', FALSE),
- array('Z', new Person(), TRUE),
- array('Z', array(new Person()), FALSE),
- array('Z', 111, FALSE),
- array('N', array('a string'), FALSE),
- array('D', array('a string'), FALSE),
- array('S', array('a string'), FALSE),
- array('W', array('a string'), FALSE),
- array('B', array('a string'), FALSE),
- array('N', 'more notes', TRUE),
- array('D', 'another record', TRUE),
- array('S', 'another source', TRUE),
- array('W', 'words', TRUE),
- array('B', 'another book', TRUE),
- );
- }
-
- /**
- * @dataProvider provider_get
- */
- public function test_get($key, $expected)
+ public function providerAppend()
{
- $result = $this->_setting->set($key, $expected);
- $result = $this->_setting->get($key);
+ return [
+ ['Y', 'anything', false],
+ ['settingID', 1, false],
+ ['tuneID', ['alpha'], false],
+ ['tuneID', 'alpha', false],
+ ['tuneID', '1', false],
+ ['tuneID', 1, false],
+ ['f', 1, false],
+ ['F', 1, true],
+ ['F', '1', true],
+ ['F', ['aplha'], false],
+ ['P', ['string'], false],
+ ['P', 10, false],
+ ['P', 'string', false],
+ ['Q', ['string'], false],
+ ['Q', 10, false],
+ ['Q', 'string', false],
+ ['Q', '1/8=200', false],
+ ['L', ['string'], false],
+ ['L', 10, false],
+ ['L', 'string', false],
+ ['L', '1/8', false],
+ ['M', ['string'], false],
+ ['M', 10, false],
+ ['M', 'string', false],
+ ['M', '6/8', false],
+ ['M', 'C', false],
+ ['M', 'c', false],
+ ['M', 'C|', false],
+ ['K', ['string'], false],
+ ['K', 10, false],
+ ['K', 'C', false],
+ ['K', 'Am', false],
+ ['K', 'A minor', false],
+ ['K', 'E dorian', false],
+ ['music', 'GABc:|\\', false],
+
+ ['Z', new Person(), true],
+ ['Z', [new Person()], false],
+ ['Z', 111, false],
+ ['N', ['a string'], false],
+ ['D', ['a string'], false],
+ ['S', ['a string'], false],
+ ['W', ['a string'], false],
+ ['B', ['a string'], false],
+ ['N', 'more notes', true],
+ ['D', 'another record', true],
+ ['S', 'another source', true],
+ ['W', 'words', true],
+ ['B', 'another book', true],
+ ];
+ }
+
+ /**
+ * @dataProvider providerGet
+ */
+ public function testGet($key, $expected)
+ {
+ $result = $this->setting->set($key, $expected);
+ $result = $this->setting->get($key);
$this->assertEquals($expected, $result);
}
- public function provider_get()
+ public function providerGet()
{
- return array(
- array('', FALSE),
- array('me', FALSE),
- array('settingID', 1),
- array('tuneID', 2),
- array('Q', '1/8=100'),
- array('L', '1/8'),
- array('M', '6/8'),
- array('K', 'Am'),
- array('music', 'GABc:|\\'),
+ return [
+ ['', false],
+ ['me', false],
+ ['settingID', 1],
+ ['tuneID', 2],
+ ['Q', '1/8=100'],
+ ['L', '1/8'],
+ ['M', '6/8'],
+ ['K', 'Am'],
+ ['music', 'GABc:|\\'],
+
+ ['Z', [new Person()]],
+ ['N', ['a string']],
+ ['D', ['a string']],
+ ['S', ['a string']],
+ ['W', ['a string']],
+ ['B', ['a string']],
+ ];
+ }
- array('Z', array(new Person())),
- array('N', array('a string')),
- array('D', array('a string')),
- array('S', array('a string')),
- array('W', array('a string')),
- array('B', array('a string')),
- );
- }
-
/**
* test the static function equals
* returns true if the data properties of 2 Setting Objects
* are identical
- *
+ *
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
- *
- * @dataProvider provider_equals
+ *
+ * @dataProvider providerEquals
*/
- public function test_equals($params)
+ public function testEquals($params)
{
- // $this->markTestIncomplete();
-
$ob1 = new Setting();
$ob2 = new Setting();
-
- foreach($params as $key => $val)
- {
- if(is_array($ob1->get($key)))
- {
+
+ foreach ($params as $key => $val) {
+ if (is_array($ob1->get($key))) {
$ob1->append($key, $val);
$ob2->append($key, $val);
- }
- else {
+ } else {
$ob1->set($key, $val);
$ob2->set($key, $val);
}
}
-
+
$this->assertTrue(Setting::equals($ob1, $ob2));
}
-
+
/**
* test the static function equals
* returns true if the data properties of 2 Abc_Tunes
* are identical
- *
+ *
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
- *
- * @dataProvider provider_equals
+ *
+ * @dataProvider providerEquals
*/
- public function test_equals_fails($params)
+ public function testEqualsFails($params)
{
$ob1 = new Setting();
$ob2 = new Setting();
-
- foreach($params as $key => $val)
- {
- if(is_array($ob1->get($key)))
- {
+
+ foreach ($params as $key => $val) {
+ if (is_array($ob1->get($key))) {
$ob1->append($key, $val);
// $ob2->append($key, $val);
- }
- else {
+ } else {
$ob1->set($key, $val);
- $ob2->set($key, $val+1);
+ $ob2->set($key, $val + 1);
}
}
$this->assertFalse(Setting::equals($ob1, $ob2));
}
- public function provider_equals()
+
+ public function providerEquals()
{
- return array(
- array( array('settingID'=>'2') ),
- array( array('tuneID'=>'2') ),
- array( array('Z'=> new Person()) ),
- array( array('N'=>'an author') ),
- array( array('D'=>'a composer') ),
- array( array('S'=>'a group') ),
- array( array('W'=>'some history') ),
- array( array('B'=>'Plymouth') ),
- array( array('F'=>'Jig') ),
- array( array('P'=>'ABB') ),
- array( array('Q'=>'1/8=100') ),
- array( array('L'=>'1/4') ),
- array( array('M'=>'2/4') ),
- array( array('K'=>'G') ),
- array( array('music'=>'a|cab|') ),
- );
+ return [
+ [['settingID' => '2']],
+ [['tuneID' => '2']],
+ [['Z' => new Person()]],
+ [['N' => 'an author']],
+ [['D' => 'a composer']],
+ [['S' => 'a group']],
+ [['W' => 'some history']],
+ [['B' => 'Plymouth']],
+ [['F' => 'Jig']],
+ [['P' => 'ABB']],
+ [['Q' => '1/8=100']],
+ [['L' => '1/4']],
+ [['M' => '2/4']],
+ [['K' => 'G']],
+ [['music' => 'a|cab|']],
+ ];
}
-
- public function test_isChanged()
+
+ public function testIsChanged()
{
$setting = new Setting();
$this->assertInstanceOf(Setting::class, $setting);
-
+
$this->assertFalse($setting->is_changed(), 'after load should be no changes');
-
- $setting->set('K','G');
+
+ $setting->set('K', 'G');
$this->assertTrue($setting->is_changed(), 'updating the name changes the data');
}
-
-
- public function test_construct()
+
+
+ public function testConstruct()
{
- $params = array(
+ $params = [
'settingID' => 3,
- 'Z' => array(new Person()),
- 'P' => 'ABC'
- );
-
- $this->_setting = new Setting ($params);
-
- foreach($params as $key => $val)
- {
- $this->assertEquals($val, $this->_setting->get($key));
+ 'Z' => [new Person()],
+ 'P' => 'ABC',
+ ];
+
+ $this->setting = new Setting($params);
+
+ foreach ($params as $key => $val) {
+ $this->assertEquals($val, $this->setting->get($key));
}
}
-
}
diff --git a/tests/unit/memory/TuneCollectionTest.php b/tests/unit/memory/TuneCollectionTest.php
index 2aac228..3f688ac 100644
--- a/tests/unit/memory/TuneCollectionTest.php
+++ b/tests/unit/memory/TuneCollectionTest.php
@@ -1,210 +1,203 @@
_tunes = new TuneCollection();
+ $this->tunes = new TuneCollection();
}
-
-
+
+
/**
* test the implementation of the Iterator interface
* 100% coverage! ;)
*/
- public function test_iterator()
+ public function testIterator()
{
$t = new Tune();
- $this->assertEquals(0, count($this->_tunes));
- $this->_tunes[] = $t;
- $this->_tunes->push($t);
- $this->assertEquals(2, count($this->_tunes));
-
- $this->assertInstanceOf(Tune::class, $this->_tunes[0], 'first tune');
- $this->assertInstanceOf(Tune::class, $this->_tunes[1], 'second tune');
-
- foreach($this->_tunes as $key=>$val)
- {
+ $this->assertEquals(0, count($this->tunes));
+ $this->tunes[] = $t;
+ $this->tunes->push($t);
+ $this->assertEquals(2, count($this->tunes));
+
+ $this->assertInstanceOf(Tune::class, $this->tunes[0], 'first tune');
+ $this->assertInstanceOf(Tune::class, $this->tunes[1], 'second tune');
+
+ foreach ($this->tunes as $key => $val) {
$this->assertInternalType('scalar', $key);
$this->assertInstanceOf(Tune::class, $val);
- $this->assertTrue(isset($this->_tunes[$key]), 'key is set');
-
- unset($this->_tunes[$key]);
- $this->assertFalse(isset($this->_tunes[$key]), 'key should have been unset');
+ $this->assertTrue(isset($this->tunes[$key]), 'key is set');
+
+ unset($this->tunes[$key]);
+ $this->assertFalse(isset($this->tunes[$key]), 'key should have been unset');
}
}
-
+
/**
* test the ability to remove the last tune from collection
- *
+ *
* tests the implementation of the Countable interface
*/
- public function test_pop()
+ public function testPop()
{
- $this->assertEquals(0, count($this->_tunes), 'no tunes in collection to begin with');
-
+ $this->assertEquals(0, count($this->tunes), 'no tunes in collection to begin with');
+
$t = new Tune();
- $this->_tunes->push($t);
-
- $this->assertEquals(1, count($this->_tunes), '1 tune added to collection');
-
- $result = $this->_tunes->pop();
- $this->assertEquals(0, count($this->_tunes), 'no tunes left in collection');
+ $this->tunes->push($t);
+
+ $this->assertEquals(1, count($this->tunes), '1 tune added to collection');
+
+ $result = $this->tunes->pop();
+ $this->assertEquals(0, count($this->tunes), 'no tunes left in collection');
$this->assertInstanceOf(Tune::class, $result);
}
-
+
// public function test_construct()
// {
- // $params = array(
- // 'tc_id' => 5,
- // 'cOwner' => 'me',
- // 'B' => array('my tune book'),
- // 'R' => 'reel'
- // );
-//
- // $this->_tunes = new TuneCollection($params);
-//
- // foreach($params as $key => $val)
- // {
- // $this->assertEquals($val, $this->_tunes->get($key));
- // }
+ // $params = array(
+ // 'tc_id' => 5,
+ // 'cOwner' => 'me',
+ // 'B' => array('my tune book'),
+ // 'R' => 'reel'
+ // );
+//
+ // $this->_tunes = new TuneCollection($params);
+//
+ // foreach($params as $key => $val)
+ // {
+ // $this->assertEquals($val, $this->_tunes->get($key));
// }
-
+ // }
+
/**
* test the set property method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to set
* @param (Boolean) expected value for return value of set method
- *
- * @dataProvider provider_set
+ *
+ * @dataProvider providerSet
*/
- public function test_set($property, $value, $expected)
+ public function testSet($property, $value, $expected)
{
- $success = $this->_tunes->set($property, $value);
+ $success = $this->tunes->set($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertEquals($value, $this->_tunes->get($property));
+ if ($success) {
+ $this->assertEquals($value, $this->tunes->get($property));
}
}
+
/**
* test the set property method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to set
* @param (Boolean) expected value for return value of set method
- *
- * @dataProvider provider_set
+ *
+ * @dataProvider providerSet
*/
- public function test_magic_setter($property, $value, $expected)
+ public function testMagicSetter($property, $value, $expected)
{
- $this->_tunes->$property = $value;
- if($expected)
- {
- $this->assertEquals($value, $this->_tunes->get($property));
+ $this->tunes->$property = $value;
+ if ($expected) {
+ $this->assertEquals($value, $this->tunes->get($property));
}
}
-
- public function provider_set()
+
+ public function providerSet()
{
- return array(
- array('Y', 'anything', FALSE),
- array('A', 10, FALSE),
- array('A', array('1','2'), FALSE),
- array('A', array(new Person(),new Person()), TRUE),
- array('C', 10, FALSE),
- array('C', array('1','2'), FALSE),
- array('C', array(new Person(),new Person()), TRUE),
- array('H', 10, FALSE),
- array('H', array('1','2'), TRUE),
- array('O', 10, FALSE),
- array('O', array('1','2'), TRUE),
- array('R', 10, FALSE),
- array('R', 'reel', TRUE),
- array('collection', 10, FALSE),
- array('collection', '10', FALSE),
- array('collection', array(), FALSE),
- array('collection', array('1','2'), FALSE),
- array('collection', array(new Tune(), 'not a tune'), FALSE),
- array('collection', array(new Tune()), TRUE),
- array('tc_id', 'abc', FALSE),
- array('tc_id', '11', TRUE),
- array('tc_id', 15, TRUE),
- array('cOwner', 'me', TRUE),
- );
+ return [
+ ['Y', 'anything', false],
+ ['A', 10, false],
+ ['A', ['1', '2'], false],
+ ['A', [new Person(), new Person()], true],
+ ['C', 10, false],
+ ['C', ['1', '2'], false],
+ ['C', [new Person(), new Person()], true],
+ ['H', 10, false],
+ ['H', ['1', '2'], true],
+ ['O', 10, false],
+ ['O', ['1', '2'], true],
+ ['R', 10, false],
+ ['R', 'reel', true],
+ ['collection', 10, false],
+ ['collection', '10', false],
+ ['collection', [], false],
+ ['collection', ['1', '2'], false],
+ ['collection', [new Tune(), 'not a tune'], false],
+ ['collection', [new Tune()], true],
+ ['tc_id', 'abc', false],
+ ['tc_id', '11', true],
+ ['tc_id', 15, true],
+ ['cOwner', 'me', true],
+ ];
}
-
- public function test_set_tc_id()
+
+ public function testSetTcId()
{
//we should start with tc_id = 0
- $this->assertEquals(0, $this->_tunes->get('tc_id'), 'should start at 0');
-
+ $this->assertEquals(0, $this->tunes->get('tc_id'), 'should start at 0');
+
//because tc_id == 0 we can change value
- $this->_tunes->set('tc_id', 4);
- $this->assertEquals(4, $this->_tunes->get('tc_id'), 'should have changed to 4');
-
+ $this->tunes->set('tc_id', 4);
+ $this->assertEquals(4, $this->tunes->get('tc_id'), 'should have changed to 4');
+
//tc_id is not 0 so we cannot change value
- $this->_tunes->set('tc_id', 11);
- $this->assertEquals(4, $this->_tunes->get('tc_id'), 'should not have changed from 4');
+ $this->tunes->set('tc_id', 11);
+ $this->assertEquals(4, $this->tunes->get('tc_id'), 'should not have changed from 4');
}
-
-
+
+
/**
* test the append value method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to append
* @param (Boolean) expected value for return value of append method
- *
- * @dataProvider provider_append
+ *
+ * @dataProvider providerAppend
*/
- public function test_append($property, $value, $expected)
+ public function testAppend($property, $value, $expected)
{
- $success = $this->_tunes->append($property, $value);
+ $success = $this->tunes->append($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertContains($value, $this->_tunes->get($property));
+ if ($success) {
+ $this->assertContains($value, $this->tunes->get($property));
}
}
-
- public function provider_append()
+
+ public function providerAppend()
{
- return array(
- array('Y', 1, FALSE),
- array('H', 'history', TRUE),
- array('R', 'reel', TRUE),
- array('r', 'reel', FALSE),
- array('collection', 'setting', FALSE),
- array('collection', new Tune(), TRUE),
- array('collection', array(new Tune()), FALSE),
- );
+ return [
+ ['Y', 1, false],
+ ['H', 'history', true],
+ ['R', 'reel', true],
+ ['r', 'reel', false],
+ ['collection', 'setting', false],
+ ['collection', new Tune(), true],
+ ['collection', [new Tune()], false],
+ ];
}
-
-
-
- public function test_get()
+
+
+ public function testGet()
{
//R is a valid property so we should get it's value
- $this->_tunes->set('R', 'reel');
- $this->assertEquals('reel', $this->_tunes->get('R'));
-
+ $this->tunes->set('R', 'reel');
+ $this->assertEquals('reel', $this->tunes->get('R'));
+
//X is not a property, so we should get FALSE
- $this->assertFalse($this->_tunes->get('X'));
+ $this->assertFalse($this->tunes->get('X'));
}
-
}
diff --git a/tests/unit/memory/TuneTest.php b/tests/unit/memory/TuneTest.php
index 125b0de..e455619 100644
--- a/tests/unit/memory/TuneTest.php
+++ b/tests/unit/memory/TuneTest.php
@@ -1,9 +1,11 @@
_tune = new Tune();
- }
-
+ private $tune;
+
+ public function setUp()
+ {
+ $this->tune = new Tune();
+ }
+
/**
* test the model contains the correct attributes
*/
- public function test_model_definition()
+ public function testModelDefinition()
{
//Private attributes, probably shouldn't be tested
$this->assertClassHasAttribute('tuneID', Tune::class);
@@ -35,276 +37,265 @@ class TuneTest extends TestCase
$this->assertClassHasAttribute('X', Tune::class);
$this->assertClassHasAttribute('propertyNames', Tune::class);
}
-
-
+
+
/**
* test the set property method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to set
* @param (Boolean) expected value for return value of set method
- *
- * @dataProvider provider_set
+ *
+ * @dataProvider providerSet
*/
- public function test_set($property, $value, $expected)
+ public function testSet($property, $value, $expected)
{
- $success = $this->_tune->set($property, $value);
+ $success = $this->tune->set($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertEquals($value, $this->_tune->get($property));
+ if ($success) {
+ $this->assertEquals($value, $this->tune->get($property));
}
}
- /**
- * test the set property method
- *
- * @param (string) $property, the name of the property to set
- * @param (mixed) value to set
- * @param (Boolean) expected value for return value of set method
- *
- * @dataProvider provider_set
- */
- public function test_magic_setter($property, $value, $expected)
- {
- $this->_tune->$property = $value;
- // $this->assertEquals($expected, $success);
- if($expected)
- {
- $this->assertEquals($value, $this->_tune->get($property));
- }
- }
-
- /**
- * @dataProvider provider_set
- */
- public function test_construct($property, $value, $expected)
- {
- $params = array($property => $value);
- $this->_tune = new Tune($params);
-
- if($expected)
- {
- $this->assertEquals($value, $this->_tune->get($property));
- }
- }
-
- public function provider_set()
- {
- return array(
- array('Y', 'anything', FALSE),
- array('x', 1, FALSE),
- array('X', 1, TRUE),
- array('X', 'aplha', FALSE),
- array('X', '2', TRUE),
- array('T', 'string', FALSE),
- array('T', 10, FALSE),
- array('T', array('1','2'), TRUE),
- array('A', 10, FALSE),
- array('A', array('1','2'), FALSE),
- array('A', array(new Person(),new Person()), TRUE),
- array('C', 10, FALSE),
- array('C', array('1','2'), FALSE),
- array('C', array(new Person(),new Person()), TRUE),
- array('G', 10, FALSE),
- array('G', array('1','2'), TRUE),
- array('H', 10, FALSE),
- array('H', array('1','2'), TRUE),
- array('O', 10, FALSE),
- array('O', array('1','2'), TRUE),
- array('R', 10, FALSE),
- array('R', array('1','2'), TRUE),
- array('collection', 10, FALSE),
- array('collection', '10', FALSE),
- array('collection', array(), FALSE),
- array('collection', array('1','2'), FALSE),
- array('collection', array(new Setting()), TRUE),
- array('tuneHash', 10, FALSE),
- array('tuneHash', '10', FALSE),
- array('tuneHash', array(), FALSE),
- array('tuneHash', array('1','2'), FALSE),
- array('tuneID', 'abc', FALSE),
- array('tuneID', '11', TRUE),
- array('tuneID', 15, TRUE),
- );
- }
- public function test_set_tuneID()
+ /**
+ * test the set property method
+ *
+ * @param (string) $property, the name of the property to set
+ * @param (mixed) value to set
+ * @param (Boolean) expected value for return value of set method
+ *
+ * @dataProvider providerSet
+ */
+ public function testMagicSetter($property, $value, $expected)
+ {
+ $this->tune->$property = $value;
+ // $this->assertEquals($expected, $success);
+ if ($expected) {
+ $this->assertEquals($value, $this->tune->get($property));
+ }
+ }
+
+ /**
+ * @dataProvider providerSet
+ */
+ public function testConstruct($property, $value, $expected)
+ {
+ $params = [$property => $value];
+ $this->tune = new Tune($params);
+
+ if ($expected) {
+ $this->assertEquals($value, $this->tune->get($property));
+ }
+ }
+
+ public function providerSet()
+ {
+ return [
+ ['Y', 'anything', false],
+ ['x', 1, false],
+ ['X', 1, true],
+ ['X', 'aplha', false],
+ ['X', '2', true],
+ ['T', 'string', false],
+ ['T', 10, false],
+ ['T', ['1', '2'], true],
+ ['A', 10, false],
+ ['A', ['1', '2'], false],
+ ['A', [new Person(), new Person()], true],
+ ['C', 10, false],
+ ['C', ['1', '2'], false],
+ ['C', [new Person(), new Person()], true],
+ ['G', 10, false],
+ ['G', ['1', '2'], true],
+ ['H', 10, false],
+ ['H', ['1', '2'], true],
+ ['O', 10, false],
+ ['O', ['1', '2'], true],
+ ['R', 10, false],
+ ['R', ['1', '2'], true],
+ ['collection', 10, false],
+ ['collection', '10', false],
+ ['collection', [], false],
+ ['collection', ['1', '2'], false],
+ ['collection', [new Setting()], true],
+ ['tuneHash', 10, false],
+ ['tuneHash', '10', false],
+ ['tuneHash', [], false],
+ ['tuneHash', ['1', '2'], false],
+ ['tuneID', 'abc', false],
+ ['tuneID', '11', true],
+ ['tuneID', 15, true],
+ ];
+ }
+
+ public function testSetTuneID()
{
//we should start with tuneID = 0
- $this->assertEquals(0, $this->_tune->get('tuneID'), 'should start at 0');
+ $this->assertEquals(0, $this->tune->get('tuneID'), 'should start at 0');
//because tuneID == 0 we can change value
- $this->_tune->set('tuneID', 4);
- $this->assertEquals(4, $this->_tune->get('tuneID'), 'should have changed to 4');
+ $this->tune->set('tuneID', 4);
+ $this->assertEquals(4, $this->tune->get('tuneID'), 'should have changed to 4');
//tuneID is not 0 so we cannot change value
- $this->_tune->set('tuneID', 11);
- $this->assertEquals(4, $this->_tune->get('tuneID'), 'should not have changed from 4');
+ $this->tune->set('tuneID', 11);
+ $this->assertEquals(4, $this->tune->get('tuneID'), 'should not have changed from 4');
}
-
-
+
+
/**
* test the append value method
- *
+ *
* @param (string) $property, the name of the property to set
* @param (mixed) value to append
* @param (Boolean) expected value for return value of append method
- *
- * @dataProvider provider_append
+ *
+ * @dataProvider providerAppend
*/
- public function test_append($property, $value, $expected)
+ public function testAppend($property, $value, $expected)
{
- $success = $this->_tune->append($property, $value);
+ $success = $this->tune->append($property, $value);
$this->assertEquals($expected, $success);
- if($success)
- {
- $this->assertContains($value, $this->_tune->get($property));
+ if ($success) {
+ $this->assertContains($value, $this->tune->get($property));
}
}
-
- public function provider_append()
+
+ public function providerAppend()
{
- return array(
- array('Y', 1, FALSE),
- array('X', 1, FALSE),
- array('T','title', TRUE),
- array('T', array('of','titles'), FALSE),
- array('A', 'author', TRUE),
- array('C', 'composer', TRUE),
- array('G', 'Group', TRUE),
- array('H', 'history', TRUE),
- array('O', 'Origin', TRUE),
- array('R', 'Rhythm', TRUE),
- array('collection', 'setting', FALSE),
- array('collection', new Setting(), TRUE),
- array('collection', array(new Setting()), FALSE),
- array('tuneHash', 'tuneHash', FALSE),
- array('tuneHash', new Setting(), FALSE),
- array('tuneHash', array(new Setting()), FALSE),
- );
+ return [
+ ['Y', 1, false],
+ ['X', 1, false],
+ ['T', 'title', true],
+ ['T', ['of', 'titles'], false],
+ ['A', 'author', true],
+ ['C', 'composer', true],
+ ['G', 'Group', true],
+ ['H', 'history', true],
+ ['O', 'Origin', true],
+ ['R', 'Rhythm', true],
+ ['collection', 'setting', false],
+ ['collection', new Setting(), true],
+ ['collection', [new Setting()], false],
+ ['tuneHash', 'tuneHash', false],
+ ['tuneHash', new Setting(), false],
+ ['tuneHash', [new Setting()], false],
+ ];
}
-
-
+
+
/**
* test the static function equals
* returns true if the data properties of 2 Abc_Tunes
* are identical
- *
+ *
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
- *
- * @dataProvider provider_equals
+ *
+ * @dataProvider providerEquals
*/
- public function test_equals($params)
+ public function testEquals($params)
{
// $this->markTestIncomplete();
-
+
$ob1 = new Tune();
$ob2 = new Tune();
-
- foreach($params as $key => $val)
- {
- if(is_array($ob1->get($key)))
- {
+
+ foreach ($params as $key => $val) {
+ if (is_array($ob1->get($key))) {
$ob1->append($key, $val);
$ob2->append($key, $val);
- }
- else {
+ } else {
$ob1->set($key, $val);
$ob2->set($key, $val);
}
}
-
+
$this->assertTrue(Tune::equals($ob1, $ob2));
}
-
+
/**
* test the static function equals
* returns true if the data properties of 2 Abc_Tunes
* are identical
- *
+ *
* @param (array) $params list of properties to set on the objects
* @param (boolean) $expected result of running equals
- *
- * @dataProvider provider_equals
+ *
+ * @dataProvider providerEquals
*/
- public function test_equals_fails($params)
+ public function testEqualsFails($params)
{
$ob1 = new Tune();
$ob2 = new Tune();
-
- foreach($params as $key => $val)
- {
- if($key === 'collection')
- {
+
+ foreach ($params as $key => $val) {
+ if ($key === 'collection') {
$ob1->set($key, $val);
- }
- else if(is_array($ob1->get($key)))
- {
+ } elseif (is_array($ob1->get($key))) {
$ob1->append($key, $val);
- }
- else {
+ } else {
$ob1->set($key, $val);
}
}
$this->assertFalse(Tune::equals($ob1, $ob2));
}
- public function provider_equals()
+
+ public function providerEquals()
{
- $setting1 = new Setting(array('settingID'=>5, 'tuneID'=>444));
- $setting2 = new Setting(array('settingID'=>3, 'tuneID'=>2244));
- return array(
- array( array('X'=>'2') ),
- array( array('T'=>'a title') ),
- array( array('A'=>'an author') ),
- array( array('C'=>'a composer') ),
- array( array('G'=>'a group') ),
- array( array('H'=>'some history') ),
- array( array('O'=>'Plymouth') ),
- array( array('R'=>'Jig') ),
- array( array('collection' => array($setting1, $setting2) ))
- );
+ $setting1 = new Setting(['settingID' => 5, 'tuneID' => 444]);
+ $setting2 = new Setting(['settingID' => 3, 'tuneID' => 2244]);
+ return [
+ [['X' => '2']],
+ [['T' => 'a title']],
+ [['A' => 'an author']],
+ [['C' => 'a composer']],
+ [['G' => 'a group']],
+ [['H' => 'some history']],
+ [['O' => 'Plymouth']],
+ [['R' => 'Jig']],
+ [['collection' => [$setting1, $setting2]]],
+ ];
}
-
-
- public function test_isChanged()
+
+
+ public function testIsChanged()
{
$tune = new Tune();
$this->assertInstanceOf(Tune::class, $tune);
-
+
$this->assertFalse($tune->is_changed(), 'after load should be no changes');
-
- $tune->set('X','5');
+
+ $tune->set('X', '5');
$this->assertTrue($tune->is_changed(), 'updating the name changes the data');
}
/**
- * @dataProvider provider_get
+ * @dataProvider providerGet
*/
- public function test_get($key, $expected)
+ public function testGet($key, $expected)
{
- $result = $this->_tune->set($key, $expected);
- $result = $this->_tune->get($key);
+ $result = $this->tune->set($key, $expected);
+ $result = $this->tune->get($key);
$this->assertEquals($expected, $result);
}
- public function provider_get()
+ public function providerGet()
{
- return array(
- array('', FALSE),
- array('me', FALSE),
- array('tuneID', 2),
- array('X', '2'),
- array('T', array('1','2')),
- array('A', array(new Person(),new Person())),
- array('C', array(new Person(),new Person())),
- array('G', array('1','2')),
- array('H', array('1','2')),
- array('O', array('1','2')),
- array('R', array('1','2')),
- array('collection', array(new Setting())),
- );
+ return [
+ ['', false],
+ ['me', false],
+ ['tuneID', 2],
+ ['X', '2'],
+ ['T', ['1', '2']],
+ ['A', [new Person(), new Person()]],
+ ['C', [new Person(), new Person()]],
+ ['G', ['1', '2']],
+ ['H', ['1', '2']],
+ ['O', ['1', '2']],
+ ['R', ['1', '2']],
+ ['collection', [new Setting()]],
+ ];
}
-
}