@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * Summary of getUserObject |
| 90 | - * @return User|null |
|
| 90 | + * @return DataObject|null |
|
| 91 | 91 | */ |
| 92 | 92 | public function getUserObject() |
| 93 | 93 | { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | 128 | * Summary of getRequestObject |
| 129 | - * @return Request|null |
|
| 129 | + * @return DataObject|null |
|
| 130 | 130 | */ |
| 131 | 131 | public function getRequestObject() |
| 132 | 132 | { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | class stringsTest extends PHPUnit_Framework_TestCase |
| 4 | 4 | { |
| 5 | - private $e; |
|
| 5 | + private $e; |
|
| 6 | 6 | |
| 7 | 7 | public function setUp() |
| 8 | 8 | { |
@@ -11,38 +11,38 @@ discard block |
||
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | public function tearDown() { |
| 14 | - $this->e = NULL; |
|
| 15 | - } |
|
| 16 | - |
|
| 17 | - public function test_struname() { |
|
| 18 | - // Happy path |
|
| 19 | - $this->assertEquals($this->e->struname("this"), "This"); |
|
| 20 | - $this->assertEquals($this->e->struname("1this"), "1this"); |
|
| 21 | - $this->assertEquals($this->e->struname("This"), "This"); |
|
| 22 | - $this->assertEquals($this->e->struname("This "), "This"); |
|
| 23 | - $this->assertEquals($this->e->struname("This_"), "This"); |
|
| 24 | - |
|
| 25 | - // Sad Path |
|
| 26 | - $this->assertNotEquals($this->e->struname("This "), "This "); |
|
| 27 | - $this->assertNotEquals($this->e->struname("This_"), "This_"); |
|
| 28 | - $this->assertNotEquals($this->e->struname("this"), "this"); |
|
| 29 | - $this->assertNotEquals($this->e->struname("1this"), "1This"); |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - public function test_stremail() { |
|
| 33 | - $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
|
| 34 | - $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
|
| 35 | - $this->assertEquals($this->e->stremail(" [email protected]"), "[email protected]"); |
|
| 36 | - $this->assertEquals($this->e->stremail("[email protected] "), "[email protected]"); |
|
| 37 | - $this->assertEquals($this->e->stremail("1this12345 @example.com"), "[email protected]"); |
|
| 38 | - $this->assertEquals($this->e->stremail("1this12345@ example.com"), "[email protected]"); |
|
| 39 | - |
|
| 40 | - // Sad Path |
|
| 41 | - $this->assertNotEquals($this->e->stremail(" [email protected]"), " [email protected]"); |
|
| 42 | - $this->assertNotEquals($this->e->stremail("[email protected] "), "[email protected] "); |
|
| 43 | - $this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com"); |
|
| 44 | - $this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com"); |
|
| 45 | - |
|
| 46 | - } |
|
| 14 | + $this->e = NULL; |
|
| 15 | + } |
|
| 16 | + |
|
| 17 | + public function test_struname() { |
|
| 18 | + // Happy path |
|
| 19 | + $this->assertEquals($this->e->struname("this"), "This"); |
|
| 20 | + $this->assertEquals($this->e->struname("1this"), "1this"); |
|
| 21 | + $this->assertEquals($this->e->struname("This"), "This"); |
|
| 22 | + $this->assertEquals($this->e->struname("This "), "This"); |
|
| 23 | + $this->assertEquals($this->e->struname("This_"), "This"); |
|
| 24 | + |
|
| 25 | + // Sad Path |
|
| 26 | + $this->assertNotEquals($this->e->struname("This "), "This "); |
|
| 27 | + $this->assertNotEquals($this->e->struname("This_"), "This_"); |
|
| 28 | + $this->assertNotEquals($this->e->struname("this"), "this"); |
|
| 29 | + $this->assertNotEquals($this->e->struname("1this"), "1This"); |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + public function test_stremail() { |
|
| 33 | + $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
|
| 34 | + $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
|
| 35 | + $this->assertEquals($this->e->stremail(" [email protected]"), "[email protected]"); |
|
| 36 | + $this->assertEquals($this->e->stremail("[email protected] "), "[email protected]"); |
|
| 37 | + $this->assertEquals($this->e->stremail("1this12345 @example.com"), "[email protected]"); |
|
| 38 | + $this->assertEquals($this->e->stremail("1this12345@ example.com"), "[email protected]"); |
|
| 39 | + |
|
| 40 | + // Sad Path |
|
| 41 | + $this->assertNotEquals($this->e->stremail(" [email protected]"), " [email protected]"); |
|
| 42 | + $this->assertNotEquals($this->e->stremail("[email protected] "), "[email protected] "); |
|
| 43 | + $this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com"); |
|
| 44 | + $this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com"); |
|
| 45 | + |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | 48 | } |
@@ -10,11 +10,13 @@ discard block |
||
| 10 | 10 | $this->e = new strings(); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function tearDown() { |
|
| 13 | + public function tearDown() |
|
| 14 | + { |
|
| 14 | 15 | $this->e = NULL; |
| 15 | 16 | } |
| 16 | 17 | |
| 17 | - public function test_struname() { |
|
| 18 | + public function test_struname() |
|
| 19 | + { |
|
| 18 | 20 | // Happy path |
| 19 | 21 | $this->assertEquals($this->e->struname("this"), "This"); |
| 20 | 22 | $this->assertEquals($this->e->struname("1this"), "1this"); |
@@ -29,7 +31,8 @@ discard block |
||
| 29 | 31 | $this->assertNotEquals($this->e->struname("1this"), "1This"); |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | - public function test_stremail() { |
|
| 34 | + public function test_stremail() |
|
| 35 | + { |
|
| 33 | 36 | $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
| 34 | 37 | $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
| 35 | 38 | $this->assertEquals($this->e->stremail(" [email protected]"), "[email protected]"); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | public function tearDown() { |
| 14 | - $this->e = NULL; |
|
| 14 | + $this->e = null; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function test_struname() { |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | 87 | * Summary of getUserObject |
| 88 | - * @return User|null |
|
| 88 | + * @return DataObject|null |
|
| 89 | 89 | */ |
| 90 | 90 | public function getUserObject() |
| 91 | 91 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $this->e = null; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function test_formatAsUsername() { |
|
| 20 | + public function test_formatAsUsername() { |
|
| 21 | 21 | // Happy path |
| 22 | 22 | $this->assertEquals($this->e->formatAsUsername("this"), "This"); |
| 23 | 23 | $this->assertEquals($this->e->formatAsUsername("1this"), "1this"); |
@@ -17,7 +17,8 @@ |
||
| 17 | 17 | $this->e = null; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function test_formatAsUsername() { |
|
| 20 | + public function test_formatAsUsername() |
|
| 21 | + { |
|
| 21 | 22 | // Happy path |
| 22 | 23 | $this->assertEquals($this->e->formatAsUsername("this"), "This"); |
| 23 | 24 | $this->assertEquals($this->e->formatAsUsername("1this"), "1this"); |