Skip to content

Commit 23d86d4

Browse files
TavoNiievezTavoNiievez
committed
Created AbstractAsserts class to have greater clarity of what the Asserts.php does and increase maintainability.
Ordered tests according to their source.
1 parent 60bce4b commit 23d86d4

File tree

5 files changed

+283
-190
lines changed

5 files changed

+283
-190
lines changed

‎composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"codeception/module-asserts",
33
"description":"Codeception module containing various assertions",
44
"keywords":["codeception", "asserts", "assertions"],
5-
"homepage":"http://codeception.com/",
5+
"homepage":"https://codeception.com/",
66
"type":"library",
77
"license":"MIT",
88
"authors":[
@@ -11,6 +11,10 @@
1111
},
1212
{
1313
"name":"Gintautas Miselis"
14+
},
15+
{
16+
"name":"Gustavo Nieves",
17+
"homepage": "https://medium.com/@ganieves"
1418
}
1519
],
1620
"minimum-stability": "RC",

‎readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
# Codeception module containing various assertions
1+
# Codeception Module Asserts
22

33
![Build Status](https://github.com/Codeception/module-asserts/workflows/CI/badge.svg)
44

5+
A Codeception module containing various assertions.
6+
57
## Installation
68

79
```

‎src/Codeception/Module/AbstractAsserts.php

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
<?php
2+
3+
namespace Codeception\Module;
4+
5+
use Codeception\Module as CodeceptionModule;
6+
use Codeception\Util\Shared\Asserts as SharedAsserts;
7+
8+
abstract class AbstractAsserts extends CodeceptionModule
9+
{
10+
use SharedAsserts {
11+
assertArrayHasKey as public;
12+
assertArrayNotHasKey as public;
13+
assertClassHasAttribute as public;
14+
assertClassHasStaticAttribute as public;
15+
assertClassNotHasAttribute as public;
16+
assertClassNotHasStaticAttribute as public;
17+
assertContains as public;
18+
assertContainsEquals as public;
19+
assertContainsOnly as public;
20+
assertContainsOnlyInstancesOf as public;
21+
assertCount as public;
22+
assertDirectoryDoesNotExist as public;
23+
assertDirectoryExists as public;
24+
assertDirectoryIsNotReadable as public;
25+
assertDirectoryIsNotWritable as public;
26+
assertDirectoryIsReadable as public;
27+
assertDirectoryIsWritable as public;
28+
assertDoesNotMatchRegularExpression as public;
29+
assertEmpty as public;
30+
assertEquals as public;
31+
assertEqualsCanonicalizing as public;
32+
assertEqualsIgnoringCase as public;
33+
assertEqualsWithDelta as public;
34+
assertFalse as public;
35+
assertFileDoesNotExist as public;
36+
assertFileEquals as public;
37+
assertFileEqualsCanonicalizing as public;
38+
assertFileEqualsIgnoringCase as public;
39+
assertFileExists as public;
40+
assertFileIsNotReadable as public;
41+
assertFileIsNotWritable as public;
42+
assertFileIsReadable as public;
43+
assertFileIsWritable as public;
44+
assertFileNotEquals as public;
45+
assertFileNotEqualsCanonicalizing as public;
46+
assertFileNotEqualsIgnoringCase as public;
47+
assertFileNotExists as public;
48+
assertFinite as public;
49+
assertGreaterOrEquals as public;
50+
assertGreaterThan as public;
51+
assertGreaterThanOrEqual as public;
52+
assertInfinite as public;
53+
assertInstanceOf as public;
54+
assertIsArray as public;
55+
assertIsBool as public;
56+
assertIsCallable as public;
57+
assertIsClosedResource as public;
58+
assertIsEmpty as public;
59+
assertIsFloat as public;
60+
assertIsInt as public;
61+
assertIsIterable as public;
62+
assertIsNotArray as public;
63+
assertIsNotBool as public;
64+
assertIsNotCallable as public;
65+
assertIsNotClosedResource as public;
66+
assertIsNotFloat as public;
67+
assertIsNotInt as public;
68+
assertIsNotIterable as public;
69+
assertIsNotNumeric as public;
70+
assertIsNotObject as public;
71+
assertIsNotReadable as public;
72+
assertIsNotResource as public;
73+
assertIsNotScalar as public;
74+
assertIsNotString as public;
75+
assertIsNotWritable as public;
76+
assertIsNumeric as public;
77+
assertIsObject as public;
78+
assertIsReadable as public;
79+
assertIsResource as public;
80+
assertIsScalar as public;
81+
assertIsString as public;
82+
assertIsWritable as public;
83+
assertJson as public;
84+
assertJsonFileEqualsJsonFile as public;
85+
assertJsonFileNotEqualsJsonFile as public;
86+
assertJsonStringEqualsJsonFile as public;
87+
assertJsonStringEqualsJsonString as public;
88+
assertJsonStringNotEqualsJsonFile as public;
89+
assertJsonStringNotEqualsJsonString as public;
90+
assertLessOrEquals as public;
91+
assertLessThan as public;
92+
assertLessThanOrEqual as public;
93+
assertMatchesRegularExpression as public;
94+
assertNan as public;
95+
assertNotContains as public;
96+
assertNotContainsEquals as public;
97+
assertNotContainsOnly as public;
98+
assertNotCount as public;
99+
assertNotEmpty as public;
100+
assertNotEquals as public;
101+
assertNotEqualsCanonicalizing as public;
102+
assertNotEqualsIgnoringCase as public;
103+
assertNotEqualsWithDelta as public;
104+
assertNotFalse as public;
105+
assertNotInstanceOf as public;
106+
assertNotNull as public;
107+
assertNotRegExp as public;
108+
assertNotSame as public;
109+
assertNotSameSize as public;
110+
assertNotTrue as public;
111+
assertNull as public;
112+
assertObjectHasAttribute as public;
113+
assertObjectNotHasAttribute as public;
114+
assertRegExp as public;
115+
assertSame as public;
116+
assertSameSize as public;
117+
assertStringContainsString as public;
118+
assertStringContainsStringIgnoringCase as public;
119+
assertStringEndsNotWith as public;
120+
assertStringEndsWith as public;
121+
assertStringEqualsFile as public;
122+
assertStringEqualsFileCanonicalizing as public;
123+
assertStringEqualsFileIgnoringCase as public;
124+
assertStringMatchesFormat as public;
125+
assertStringMatchesFormatFile as public;
126+
assertStringNotContainsString as public;
127+
assertStringNotContainsStringIgnoringCase as public;
128+
assertStringNotEqualsFile as public;
129+
assertStringNotEqualsFileCanonicalizing as public;
130+
assertStringNotEqualsFileIgnoringCase as public;
131+
assertStringNotMatchesFormat as public;
132+
assertStringNotMatchesFormatFile as public;
133+
assertStringStartsNotWith as public;
134+
assertStringStartsWith as public;
135+
assertThat as public;
136+
assertThatItsNot as public;
137+
assertTrue as public;
138+
assertXmlFileEqualsXmlFile as public;
139+
assertXmlFileNotEqualsXmlFile as public;
140+
assertXmlStringEqualsXmlFile as public;
141+
assertXmlStringEqualsXmlString as public;
142+
assertXmlStringNotEqualsXmlFile as public;
143+
assertXmlStringNotEqualsXmlString as public;
144+
fail as public;
145+
markTestIncomplete as public;
146+
markTestSkipped as public;
147+
}
148+
}

‎src/Codeception/Module/Asserts.php

Lines changed: 1 addition & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -3,155 +3,14 @@
33
namespace Codeception\Module;
44

55
use Codeception\Lib\Notification;
6-
use Codeception\Module as CodeceptionModule;
7-
use Codeception\Util\Shared\Asserts as SharedAsserts;
86
use Exception;
97
use Throwable;
108

119
/**
1210
* Special module for using asserts in your tests.
1311
*/
14-
class Asserts extends CodeceptionModule
12+
class Asserts extends AbstractAsserts
1513
{
16-
use SharedAsserts {
17-
assertArrayHasKey as public;
18-
assertArrayNotHasKey as public;
19-
assertClassHasAttribute as public;
20-
assertClassHasStaticAttribute as public;
21-
assertClassNotHasAttribute as public;
22-
assertClassNotHasStaticAttribute as public;
23-
assertContains as public;
24-
assertContainsEquals as public;
25-
assertContainsOnly as public;
26-
assertContainsOnlyInstancesOf as public;
27-
assertCount as public;
28-
assertDirectoryDoesNotExist as public;
29-
assertDirectoryExists as public;
30-
assertDirectoryIsNotReadable as public;
31-
assertDirectoryIsNotWritable as public;
32-
assertDirectoryIsReadable as public;
33-
assertDirectoryIsWritable as public;
34-
assertDoesNotMatchRegularExpression as public;
35-
assertEmpty as public;
36-
assertEquals as public;
37-
assertEqualsCanonicalizing as public;
38-
assertEqualsIgnoringCase as public;
39-
assertEqualsWithDelta as public;
40-
assertFalse as public;
41-
assertFileDoesNotExist as public;
42-
assertFileEquals as public;
43-
assertFileEqualsCanonicalizing as public;
44-
assertFileEqualsIgnoringCase as public;
45-
assertFileExists as public;
46-
assertFileIsNotReadable as public;
47-
assertFileIsNotWritable as public;
48-
assertFileIsReadable as public;
49-
assertFileIsWritable as public;
50-
assertFileNotEquals as public;
51-
assertFileNotEqualsCanonicalizing as public;
52-
assertFileNotEqualsIgnoringCase as public;
53-
assertFileNotExists as public;
54-
assertFinite as public;
55-
assertGreaterOrEquals as public;
56-
assertGreaterThan as public;
57-
assertGreaterThanOrEqual as public;
58-
assertInfinite as public;
59-
assertInstanceOf as public;
60-
assertIsArray as public;
61-
assertIsBool as public;
62-
assertIsCallable as public;
63-
assertIsClosedResource as public;
64-
assertIsEmpty as public;
65-
assertIsFloat as public;
66-
assertIsInt as public;
67-
assertIsIterable as public;
68-
assertIsNotArray as public;
69-
assertIsNotBool as public;
70-
assertIsNotCallable as public;
71-
assertIsNotClosedResource as public;
72-
assertIsNotFloat as public;
73-
assertIsNotInt as public;
74-
assertIsNotIterable as public;
75-
assertIsNotNumeric as public;
76-
assertIsNotObject as public;
77-
assertIsNotReadable as public;
78-
assertIsNotResource as public;
79-
assertIsNotScalar as public;
80-
assertIsNotString as public;
81-
assertIsNotWritable as public;
82-
assertIsNumeric as public;
83-
assertIsObject as public;
84-
assertIsReadable as public;
85-
assertIsResource as public;
86-
assertIsScalar as public;
87-
assertIsString as public;
88-
assertIsWritable as public;
89-
assertJson as public;
90-
assertJsonFileEqualsJsonFile as public;
91-
assertJsonFileNotEqualsJsonFile as public;
92-
assertJsonStringEqualsJsonFile as public;
93-
assertJsonStringEqualsJsonString as public;
94-
assertJsonStringNotEqualsJsonFile as public;
95-
assertJsonStringNotEqualsJsonString as public;
96-
assertLessOrEquals as public;
97-
assertLessThan as public;
98-
assertLessThanOrEqual as public;
99-
assertMatchesRegularExpression as public;
100-
assertNan as public;
101-
assertNotContains as public;
102-
assertNotContainsEquals as public;
103-
assertNotContainsOnly as public;
104-
assertNotCount as public;
105-
assertNotEmpty as public;
106-
assertNotEquals as public;
107-
assertNotEqualsCanonicalizing as public;
108-
assertNotEqualsIgnoringCase as public;
109-
assertNotEqualsWithDelta as public;
110-
assertNotFalse as public;
111-
assertNotInstanceOf as public;
112-
assertNotNull as public;
113-
assertNotRegExp as public;
114-
assertNotSame as public;
115-
assertNotSameSize as public;
116-
assertNotTrue as public;
117-
assertNull as public;
118-
assertObjectHasAttribute as public;
119-
assertObjectNotHasAttribute as public;
120-
assertRegExp as public;
121-
assertSame as public;
122-
assertSameSize as public;
123-
assertStringContainsString as public;
124-
assertStringContainsStringIgnoringCase as public;
125-
assertStringEndsNotWith as public;
126-
assertStringEndsWith as public;
127-
assertStringEqualsFile as public;
128-
assertStringEqualsFileCanonicalizing as public;
129-
assertStringEqualsFileIgnoringCase as public;
130-
assertStringMatchesFormat as public;
131-
assertStringMatchesFormatFile as public;
132-
assertStringNotContainsString as public;
133-
assertStringNotContainsStringIgnoringCase as public;
134-
assertStringNotEqualsFile as public;
135-
assertStringNotEqualsFileCanonicalizing as public;
136-
assertStringNotEqualsFileIgnoringCase as public;
137-
assertStringNotMatchesFormat as public;
138-
assertStringNotMatchesFormatFile as public;
139-
assertStringStartsNotWith as public;
140-
assertStringStartsWith as public;
141-
assertThat as public;
142-
assertThatItsNot as public;
143-
assertTrue as public;
144-
assertXmlFileEqualsXmlFile as public;
145-
assertXmlFileNotEqualsXmlFile as public;
146-
assertXmlStringEqualsXmlFile as public;
147-
assertXmlStringEqualsXmlString as public;
148-
assertXmlStringNotEqualsXmlFile as public;
149-
assertXmlStringNotEqualsXmlString as public;
150-
fail as public;
151-
markTestIncomplete as public;
152-
markTestSkipped as public;
153-
}
154-
15514
/**
15615
* Handles and checks exception called inside callback function.
15716
* Either exception class name or exception instance should be provided.

0 commit comments

Comments
 (0)