@@ -15,23 +15,26 @@ public function setUp()
15
15
public function test_encoding_iso88591_as_UTF8 ()
16
16
{
17
17
$ encoding = new FileEncoding ();
18
- $ result = $ encoding ->encodeFile ('iso88591.txt ' , 'UTF-8 ' , 'UTF-8,ISO-8859-1,WINDOWS-1252 ' );
19
- $ this ->assertTrue ($ result );
18
+ $ this ->assertTrue ($ encoding ->detectEncoding ('iso88591.txt ' , 'UTF-8,ISO-8859-1,WINDOWS-1252 ' ) == 'ISO-8859-1 ' );
19
+ $ this ->assertTrue ($ encoding ->encodeFile ('iso88591.txt ' , 'UTF-8 ' , 'UTF-8,ISO-8859-1,WINDOWS-1252 ' ));
20
+ $ this ->assertTrue ($ encoding ->checkEncoding ('iso88591.txt ' ,'UTF-8 ' ));
20
21
}
21
22
22
23
/** @test */
23
24
public function test_encoding_UTF8_as_UTF8 ()
24
25
{
25
26
$ encoding = new FileEncoding ();
26
- $ result = $ encoding ->encodeFile ('utf8.txt ' );
27
- $ this ->assertTrue ($ result );
27
+ $ this ->assertTrue ($ encoding ->detectEncoding ('utf8.txt ' , 'UTF-8,ISO-8859-1,WINDOWS-1252 ' ) == 'UTF-8 ' );
28
+ $ this ->assertTrue ($ result = $ encoding ->encodeFile ('utf8.txt ' ));
29
+ $ this ->assertTrue ($ encoding ->checkEncoding ('utf8.txt ' ,'UTF-8 ' ));
28
30
}
29
31
30
32
/** @test */
31
33
public function test_encoding_file_not_exists ()
32
34
{
33
35
$ encoding = new FileEncoding ();
34
- $ result = $ encoding ->encodeFile ('test.txt ' );
35
- $ this ->assertFalse ($ result );
36
+ $ this ->assertFalse ($ encoding ->detectEncoding ('test.txt ' , 'UTF-8,ISO-8859-1,WINDOWS-1252 ' ) == 'UTF-8 ' );
37
+ $ this ->assertFalse ($ result = $ encoding ->encodeFile ('test.txt ' ));
38
+ $ this ->assertFalse ($ encoding ->checkEncoding ('test.txt ' ,'UTF-8 ' ));
36
39
}
37
40
}
0 commit comments