Skip to content

Commit 2f4bfde

Browse files
authored
Merge pull request #1 from AydinHassan/fix-bitwise-checks
Fix bitwise tests + add unit tests
2 parents 0a675ec + 83956e5 commit 2f4bfde

File tree

5 files changed

+109
-14
lines changed

5 files changed

+109
-14
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"rx/child-process": "^1.0"
4343
},
4444
"require-dev": {
45-
"phpunit/phpunit": "^5.7"
45+
"phpunit/phpunit": "^6.2"
4646
}
4747
}

phpunit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
processIsolation="false"
1010
stopOnFailure="false"
1111
syntaxCheck="false"
12-
bootstrap="tests/bootstrap.php">
12+
bootstrap="test/bootstrap.php">
1313
<testsuites>
1414
<testsuite name="Rx/FsWatch Tests">
15-
<directory>tests/</directory>
15+
<directory>test/</directory>
1616
</testsuite>
1717
</testsuites>
1818

src/WatchEvent.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,56 +58,56 @@ public function getEvents()
5858

5959
public function isFile()
6060
{
61-
return (bool)$this->bitwise & self::IS_FILE;
61+
return (bool) ($this->bitwise & self::IS_FILE);
6262
}
6363

6464
public function isDir()
6565
{
66-
return (bool)$this->bitwise & self::IS_DIR;
66+
return (bool) ($this->bitwise & self::IS_DIR);
6767
}
6868

6969
public function isSymbolicLink()
7070
{
71-
return (bool)$this->bitwise & self::IS_SYM_LINK;
71+
return (bool) ($this->bitwise & self::IS_SYM_LINK);
7272
}
7373

7474
public function isLink()
7575
{
76-
return (bool)$this->bitwise & self::LINK;
76+
return (bool) ($this->bitwise & self::LINK);
7777
}
7878

7979
public function noOp()
8080
{
81-
return (bool)$this->bitwise & self::NO_OP;
81+
return (bool) ($this->bitwise & self::NO_OP);
8282
}
8383

8484
public function attributeModified()
8585
{
86-
return (bool)$this->bitwise & self::ATTRIBUTE_MODIFIED;
86+
return (bool) ($this->bitwise & self::ATTRIBUTE_MODIFIED);
8787
}
8888

8989
public function ownerModified()
9090
{
91-
return (bool)$this->bitwise & self::OWNER_MODIFIED;
91+
return (bool) ($this->bitwise & self::OWNER_MODIFIED);
9292
}
9393

9494
public function created()
9595
{
96-
return (bool)$this->bitwise & self::CREATED;
96+
return (bool) ($this->bitwise & self::CREATED);
9797
}
9898

9999
public function removed()
100100
{
101-
return (bool)$this->bitwise & self::REMOVED;
101+
return (bool) ($this->bitwise & self::REMOVED);
102102
}
103103

104104
public function renamed()
105105
{
106-
return (bool)$this->bitwise & self::RENAMED;
106+
return (bool) ($this->bitwise & self::RENAMED);
107107
}
108108

109109
public function updated()
110110
{
111-
return (bool)$this->bitwise & self::UPDATED;
111+
return (bool) ($this->bitwise & self::UPDATED);
112112
}
113113
}

test/Rx/WatchEventTest.php

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?php
2+
3+
namespace Rx\React\Tests;
4+
5+
use PHPUnit\Framework\TestCase;
6+
use Rx\React\WatchEvent;
7+
8+
/**
9+
* @author Aydin Hassan <[email protected]>
10+
*/
11+
class WatchEventTest extends TestCase
12+
{
13+
public function testFileCreated()
14+
{
15+
$e = new WatchEvent('/some/file.txt', 514);
16+
17+
self::assertTrue($e->created());
18+
self::assertEquals('/some/file.txt', $e->getFile());
19+
self::assertEquals(514, $e->getBitwise());
20+
}
21+
22+
public function testFileUpdated()
23+
{
24+
$e = new WatchEvent('/some/file.txt', 516);
25+
26+
self::assertTrue($e->updated());
27+
self::assertEquals('/some/file.txt', $e->getFile());
28+
self::assertEquals(516, $e->getBitwise());
29+
}
30+
31+
public function testFileRenamed()
32+
{
33+
$e = new WatchEvent('/some/file.txt', 528);
34+
35+
self::assertTrue($e->renamed());
36+
self::assertEquals('/some/file.txt', $e->getFile());
37+
self::assertEquals(528, $e->getBitwise());
38+
}
39+
40+
public function testFileRemoved()
41+
{
42+
$e = new WatchEvent('/some/file.txt', 520);
43+
44+
self::assertTrue($e->removed());
45+
self::assertEquals('/some/file.txt', $e->getFile());
46+
self::assertEquals(520, $e->getBitwise());
47+
}
48+
49+
public function testFileOwnerModified()
50+
{
51+
$e = new WatchEvent('/some/file.txt', 544);
52+
53+
self::assertTrue($e->ownerModified());
54+
self::assertEquals('/some/file.txt', $e->getFile());
55+
self::assertEquals(544, $e->getBitwise());
56+
}
57+
58+
public function testFileAttributeModified()
59+
{
60+
$e = new WatchEvent('/some/file.txt', 576);
61+
62+
self::assertTrue($e->attributeModified());
63+
self::assertEquals('/some/file.txt', $e->getFile());
64+
self::assertEquals(576, $e->getBitwise());
65+
}
66+
67+
public function testFileIsLink()
68+
{
69+
$e = new WatchEvent('/some/file.txt', 4608);
70+
71+
self::assertTrue($e->isFile());
72+
self::assertTrue($e->isLink());
73+
self::assertEquals('/some/file.txt', $e->getFile());
74+
self::assertEquals(4608, $e->getBitwise());
75+
}
76+
77+
public function testFileIsSymbolicLink()
78+
{
79+
$e = new WatchEvent('/some/file.txt', 2560);
80+
81+
self::assertTrue($e->isFile());
82+
self::assertTrue($e->isSymbolicLink());
83+
self::assertEquals('/some/file.txt', $e->getFile());
84+
self::assertEquals(2560, $e->getBitwise());
85+
}
86+
87+
public function testDir()
88+
{
89+
$e = new WatchEvent('/some/dir', 1024);
90+
91+
self::assertTrue($e->isDir());
92+
self::assertEquals('/some/dir', $e->getFile());
93+
self::assertEquals(1024, $e->getBitwise());
94+
}
95+
}
File renamed without changes.

0 commit comments

Comments
 (0)