Skip to content

Commit cbd1929

Browse files
GrahamCampbellGrahamCampbell
committed
Merge pull request #152 from lucasmichot/feature/master/assertions
Use stricter and proper assertions
2 parents a69bdfc + 1a46a50 commit cbd1929

File tree

1 file changed

+53
-53
lines changed

1 file changed

+53
-53
lines changed

‎tests/Dotenv/DotenvTest.php

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,35 @@ public function testDotenvLoadsEnvironmentVars()
2828
{
2929
$dotenv = new Dotenv($this->fixturesFolder);
3030
$dotenv->load();
31-
$this->assertEquals('bar', getenv('FOO'));
32-
$this->assertEquals('baz', getenv('BAR'));
33-
$this->assertEquals('with spaces', getenv('SPACED'));
34-
$this->assertEquals('', getenv('NULL'));
31+
$this->assertSame('bar', getenv('FOO'));
32+
$this->assertSame('baz', getenv('BAR'));
33+
$this->assertSame('with spaces', getenv('SPACED'));
34+
$this->assertEmpty(getenv('NULL'));
3535
}
3636

3737
public function testCommentedDotenvLoadsEnvironmentVars()
3838
{
3939
$dotenv = new Dotenv($this->fixturesFolder, 'commented.env');
4040
$dotenv->load();
41-
$this->assertEquals('bar', getenv('CFOO'));
42-
$this->assertEquals(false, getenv('CBAR'));
43-
$this->assertEquals(false, getenv('CZOO'));
44-
$this->assertEquals('with spaces', getenv('CSPACED'));
45-
$this->assertEquals('a value with a # character', getenv('CQUOTES'));
46-
$this->assertEquals('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
47-
$this->assertEquals('', getenv('CNULL'));
41+
$this->assertSame('bar', getenv('CFOO'));
42+
$this->assertFalse(getenv('CBAR'));
43+
$this->assertFalse(getenv('CZOO'));
44+
$this->assertSame('with spaces', getenv('CSPACED'));
45+
$this->assertSame('a value with a # character', getenv('CQUOTES'));
46+
$this->assertSame('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
47+
$this->assertEmpty(getenv('CNULL'));
4848
}
4949

5050
public function testQuotedDotenvLoadsEnvironmentVars()
5151
{
5252
$dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
5353
$dotenv->load();
54-
$this->assertEquals('bar', getenv('QFOO'));
55-
$this->assertEquals('baz', getenv('QBAR'));
56-
$this->assertEquals('with spaces', getenv('QSPACED'));
57-
$this->assertEquals('', getenv('QNULL'));
58-
$this->assertEquals('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
59-
$this->assertEquals('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
54+
$this->assertSame('bar', getenv('QFOO'));
55+
$this->assertSame('baz', getenv('QBAR'));
56+
$this->assertSame('with spaces', getenv('QSPACED'));
57+
$this->assertEmpty(getenv('QNULL'));
58+
$this->assertSame('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
59+
$this->assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
6060
}
6161

6262
/**
@@ -73,30 +73,30 @@ public function testExportedDotenvLoadsEnvironmentVars()
7373
{
7474
$dotenv = new Dotenv($this->fixturesFolder, 'exported.env');
7575
$dotenv->load();
76-
$this->assertEquals('bar', getenv('EFOO'));
77-
$this->assertEquals('baz', getenv('EBAR'));
78-
$this->assertEquals('with spaces', getenv('ESPACED'));
79-
$this->assertEquals('', getenv('ENULL'));
76+
$this->assertSame('bar', getenv('EFOO'));
77+
$this->assertSame('baz', getenv('EBAR'));
78+
$this->assertSame('with spaces', getenv('ESPACED'));
79+
$this->assertEmpty(getenv('ENULL'));
8080
}
8181

8282
public function testDotenvLoadsEnvGlobals()
8383
{
8484
$dotenv = new Dotenv($this->fixturesFolder);
8585
$dotenv->load();
86-
$this->assertEquals('bar', $_SERVER['FOO']);
87-
$this->assertEquals('baz', $_SERVER['BAR']);
88-
$this->assertEquals('with spaces', $_SERVER['SPACED']);
89-
$this->assertEquals('', $_SERVER['NULL']);
86+
$this->assertSame('bar', $_SERVER['FOO']);
87+
$this->assertSame('baz', $_SERVER['BAR']);
88+
$this->assertSame('with spaces', $_SERVER['SPACED']);
89+
$this->assertEmpty($_SERVER['NULL']);
9090
}
9191

9292
public function testDotenvLoadsServerGlobals()
9393
{
9494
$dotenv = new Dotenv($this->fixturesFolder);
9595
$dotenv->load();
96-
$this->assertEquals('bar', $_ENV['FOO']);
97-
$this->assertEquals('baz', $_ENV['BAR']);
98-
$this->assertEquals('with spaces', $_ENV['SPACED']);
99-
$this->assertEquals('', $_ENV['NULL']);
96+
$this->assertSame('bar', $_ENV['FOO']);
97+
$this->assertSame('baz', $_ENV['BAR']);
98+
$this->assertSame('with spaces', $_ENV['SPACED']);
99+
$this->assertEmpty($_ENV['NULL']);
100100
}
101101

102102
/**
@@ -129,9 +129,9 @@ public function testDotenvNestedEnvironmentVars()
129129
{
130130
$dotenv = new Dotenv($this->fixturesFolder, 'nested.env');
131131
$dotenv->load();
132-
$this->assertEquals('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
133-
$this->assertEquals('Hello World!', $_ENV['NVAR4']);
134-
$this->assertEquals('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
132+
$this->assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
133+
$this->assertSame('Hello World!', $_ENV['NVAR4']);
134+
$this->assertSame('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
135135
}
136136

137137
/**
@@ -170,16 +170,16 @@ public function testDotenvRequiredThrowsRuntimeException()
170170
{
171171
$dotenv = new Dotenv($this->fixturesFolder);
172172
$dotenv->load();
173-
$this->assertEquals(false, getenv('FOOX'));
174-
$this->assertEquals(false, getenv('NOPE'));
173+
$this->assertFalse(getenv('FOOX'));
174+
$this->assertFalse(getenv('NOPE'));
175175
$dotenv->required(array('FOOX', 'NOPE'));
176176
}
177177

178178
public function testDotenvNullFileArgumentUsesDefault()
179179
{
180180
$dotenv = new Dotenv($this->fixturesFolder, null);
181181
$dotenv->load();
182-
$this->assertEquals('bar', getenv('FOO'));
182+
$this->assertSame('bar', getenv('FOO'));
183183
}
184184

185185
/**
@@ -191,67 +191,67 @@ public function testDotenvTrimmedKeys()
191191
{
192192
$dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
193193
$dotenv->load();
194-
$this->assertEquals('no space', getenv('QWHITESPACE'));
194+
$this->assertSame('no space', getenv('QWHITESPACE'));
195195
}
196196

197197
public function testDotenvLoadDoesNotOverwriteEnv()
198198
{
199199
putenv('IMMUTABLE=true');
200200
$dotenv = new Dotenv($this->fixturesFolder, 'immutable.env');
201201
$dotenv->load();
202-
$this->assertEquals('true', getenv('IMMUTABLE'));
202+
$this->assertSame('true', getenv('IMMUTABLE'));
203203
}
204204

205205
public function testDotenvLoadAfterOverload()
206206
{
207207
putenv('IMMUTABLE=true');
208208
$dotenv = new Dotenv($this->fixturesFolder, 'immutable.env');
209209
$dotenv->overload();
210-
$this->assertEquals('false', getenv('IMMUTABLE'));
210+
$this->assertSame('false', getenv('IMMUTABLE'));
211211

212212
putenv('IMMUTABLE=true');
213213
$dotenv->load();
214-
$this->assertEquals('true', getenv('IMMUTABLE'));
214+
$this->assertSame('true', getenv('IMMUTABLE'));
215215
}
216216

217217
public function testDotenvOverloadAfterLoad()
218218
{
219219
putenv('IMMUTABLE=true');
220220
$dotenv = new Dotenv($this->fixturesFolder, 'immutable.env');
221221
$dotenv->load();
222-
$this->assertEquals('true', getenv('IMMUTABLE'));
222+
$this->assertSame('true', getenv('IMMUTABLE'));
223223

224224
putenv('IMMUTABLE=true');
225225
$dotenv->overload();
226-
$this->assertEquals('false', getenv('IMMUTABLE'));
226+
$this->assertSame('false', getenv('IMMUTABLE'));
227227
}
228228

229229
public function testDotenvOverloadDoesOverwriteEnv()
230230
{
231231
$dotenv = new Dotenv($this->fixturesFolder, 'mutable.env');
232232
$dotenv->overload();
233-
$this->assertEquals('true', getenv('MUTABLE'));
233+
$this->assertSame('true', getenv('MUTABLE'));
234234
}
235235

236236
public function testDotenvAllowsSpecialCharacters()
237237
{
238238
$dotenv = new Dotenv($this->fixturesFolder, 'specialchars.env');
239239
$dotenv->load();
240-
$this->assertEquals('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
241-
$this->assertEquals('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
242-
$this->assertEquals('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
243-
$this->assertEquals('22222:22#2^{', getenv('SPVAR4'));
244-
$this->assertEquals('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
240+
$this->assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
241+
$this->assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
242+
$this->assertSame('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
243+
$this->assertSame('22222:22#2^{', getenv('SPVAR4'));
244+
$this->assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
245245
}
246246

247247
public function testDotenvAssertions()
248248
{
249249
$dotenv = new Dotenv($this->fixturesFolder, 'assertions.env');
250250
$dotenv->load();
251-
$this->assertEquals('val1', getenv('ASSERTVAR1'));
252-
$this->assertEquals('', getenv('ASSERTVAR2'));
253-
$this->assertEquals('', getenv('ASSERTVAR3'));
254-
$this->assertEquals('0', getenv('ASSERTVAR4'));
251+
$this->assertSame('val1', getenv('ASSERTVAR1'));
252+
$this->assertEmpty(getenv('ASSERTVAR2'));
253+
$this->assertEmpty(getenv('ASSERTVAR3'));
254+
$this->assertSame('0', getenv('ASSERTVAR4'));
255255

256256
$dotenv->required(array(
257257
'ASSERTVAR1',
@@ -281,7 +281,7 @@ public function testDotenvEmptyThrowsRuntimeException()
281281
{
282282
$dotenv = new Dotenv($this->fixturesFolder, 'assertions.env');
283283
$dotenv->load();
284-
$this->assertEquals('', getenv('ASSERTVAR2'));
284+
$this->assertEmpty(getenv('ASSERTVAR2'));
285285

286286
$dotenv->required('ASSERTVAR2')->notEmpty();
287287
}
@@ -294,7 +294,7 @@ public function testDotenvStringOfSpacesConsideredEmpty()
294294
{
295295
$dotenv = new Dotenv($this->fixturesFolder, 'assertions.env');
296296
$dotenv->load();
297-
$this->assertEquals('', getenv('ASSERTVAR3'));
297+
$this->assertEmpty(getenv('ASSERTVAR3'));
298298

299299
$dotenv->required('ASSERTVAR3')->notEmpty();
300300
}

0 commit comments

Comments
 (0)