Skip to content

Commit 6951fe2

Browse files
andrey-helldarandrey-helldar
authored
Merge pull request #82 from TheDragonCode/3.x
Updated tests
2 parents f6e4b8b + 163e37f commit 6951fe2

File tree

6 files changed

+210
-48
lines changed

6 files changed

+210
-48
lines changed

‎tests/Cache/NotWhen/Simple/ArrayTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,47 @@ public function testForget()
5252
$this->assertNull($this->cache()->get());
5353
}
5454

55-
public function testFlush()
55+
public function testFlushByKeys()
5656
{
57-
$tags = Cache::make()->tags('foo', 'bar');
58-
$cache = (clone $tags)->key('qwerty');
57+
$cache1 = Cache::make()->when($this->when)->key('foo');
58+
$cache2 = Cache::make()->when($this->when)->key('bar');
5959

60-
$this->assertNull($cache->get());
60+
$this->assertNull($cache1->get());
61+
$this->assertNull($cache2->get());
6162

62-
$cache->put('asd');
63+
$cache1->put('qwe');
64+
$cache2->put('rty');
6365

64-
$this->assertSame('asd', $cache->get());
66+
$this->assertNull($cache1->get());
67+
$this->assertNull($cache2->get());
6568

66-
$tags->flush();
69+
$cache1->flush();
6770

68-
$this->assertNull($cache->get());
71+
$this->assertNull($cache1->get());
72+
$this->assertNull($cache2->get());
73+
}
74+
75+
public function testFlushByTags()
76+
{
77+
$tags1 = Cache::make()->when($this->when)->tags('some1');
78+
$tags2 = Cache::make()->when($this->when)->tags('some2');
79+
80+
$cache1 = (clone $tags1)->key('foo');
81+
$cache2 = (clone $tags2)->key('bar');
82+
83+
$this->assertNull($cache1->get());
84+
$this->assertNull($cache2->get());
85+
86+
$cache1->put('qwe');
87+
$cache2->put('rty');
88+
89+
$this->assertNull($cache1->get());
90+
$this->assertNull($cache2->get());
91+
92+
$tags1->flush();
93+
94+
$this->assertNull($cache1->get());
95+
$this->assertNull($cache2->get());
6996
}
7097

7198
public function testHas()

‎tests/Cache/NotWhen/Simple/FileTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,47 @@ public function testForget()
5252
$this->assertNull($this->cache()->get());
5353
}
5454

55-
public function testFlush()
55+
public function testFlushByKeys()
5656
{
57-
$tags = Cache::make()->tags('foo', 'bar');
58-
$cache = (clone $tags)->key('qwerty');
57+
$cache1 = Cache::make()->when($this->when)->key('foo');
58+
$cache2 = Cache::make()->when($this->when)->key('bar');
5959

60-
$this->assertNull($cache->get());
60+
$this->assertNull($cache1->get());
61+
$this->assertNull($cache2->get());
6162

62-
$cache->put('asd');
63+
$cache1->put('qwe');
64+
$cache2->put('rty');
6365

64-
$this->assertSame('asd', $cache->get());
66+
$this->assertNull($cache1->get());
67+
$this->assertNull($cache2->get());
6568

66-
$tags->flush();
69+
$cache1->flush();
6770

68-
$this->assertNull($cache->get());
71+
$this->assertNull($cache1->get());
72+
$this->assertNull($cache2->get());
73+
}
74+
75+
public function testFlushByTags()
76+
{
77+
$tags1 = Cache::make()->when($this->when)->tags('some1');
78+
$tags2 = Cache::make()->when($this->when)->tags('some2');
79+
80+
$cache1 = (clone $tags1)->key('foo');
81+
$cache2 = (clone $tags2)->key('bar');
82+
83+
$this->assertNull($cache1->get());
84+
$this->assertNull($cache2->get());
85+
86+
$cache1->put('qwe');
87+
$cache2->put('rty');
88+
89+
$this->assertNull($cache1->get());
90+
$this->assertNull($cache2->get());
91+
92+
$tags1->flush();
93+
94+
$this->assertNull($cache1->get());
95+
$this->assertNull($cache2->get());
6996
}
7097

7198
public function testHas()

‎tests/Cache/NotWhen/Simple/RedisTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,47 @@ public function testForget()
7474
$this->assertNull($this->cache(['cache'])->get());
7575
}
7676

77-
public function testFlush()
77+
public function testFlushByKeys()
7878
{
79-
$tags = Cache::make()->tags('foo', 'bar');
80-
$cache = (clone $tags)->key('qwerty');
79+
$cache1 = Cache::make()->when($this->when)->key('foo');
80+
$cache2 = Cache::make()->when($this->when)->key('bar');
8181

82-
$this->assertNull($cache->get());
82+
$this->assertNull($cache1->get());
83+
$this->assertNull($cache2->get());
8384

84-
$cache->put('asd');
85+
$cache1->put('qwe');
86+
$cache2->put('rty');
8587

86-
$this->assertSame('asd', $cache->get());
88+
$this->assertNull($cache1->get());
89+
$this->assertNull($cache2->get());
8790

88-
$tags->flush();
91+
$cache1->flush();
8992

90-
$this->assertNull($cache->get());
93+
$this->assertNull($cache1->get());
94+
$this->assertNull($cache2->get());
95+
}
96+
97+
public function testFlushByTags()
98+
{
99+
$tags1 = Cache::make()->when($this->when)->tags('some1');
100+
$tags2 = Cache::make()->when($this->when)->tags('some2');
101+
102+
$cache1 = (clone $tags1)->key('foo');
103+
$cache2 = (clone $tags2)->key('bar');
104+
105+
$this->assertNull($cache1->get());
106+
$this->assertNull($cache2->get());
107+
108+
$cache1->put('qwe');
109+
$cache2->put('rty');
110+
111+
$this->assertNull($cache1->get());
112+
$this->assertNull($cache2->get());
113+
114+
$tags1->flush();
115+
116+
$this->assertNull($cache1->get());
117+
$this->assertNull($cache2->get());
91118
}
92119

93120
public function testHas()

‎tests/Cache/When/Simple/ArrayTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,47 @@ public function testForget()
6262
$this->assertNull($this->cache()->get());
6363
}
6464

65-
public function testFlush()
65+
public function testFlushByKeys()
6666
{
67-
$tags = Cache::make()->tags('foo', 'bar');
68-
$cache = (clone $tags)->key('qwerty');
67+
$cache1 = Cache::make()->key('foo');
68+
$cache2 = Cache::make()->key('bar');
6969

70-
$this->assertNull($cache->get());
70+
$this->assertNull($cache1->get());
71+
$this->assertNull($cache2->get());
7172

72-
$cache->put('asd');
73+
$cache1->put('qwe');
74+
$cache2->put('rty');
7375

74-
$this->assertSame('asd', $cache->get());
76+
$this->assertSame('qwe', $cache1->get());
77+
$this->assertSame('rty', $cache2->get());
7578

76-
$tags->flush();
79+
$cache1->flush();
7780

78-
$this->assertNull($cache->get());
81+
$this->assertNull($cache1->get());
82+
$this->assertNull($cache2->get());
83+
}
84+
85+
public function testFlushByTags()
86+
{
87+
$tags1 = Cache::make()->tags('some1');
88+
$tags2 = Cache::make()->tags('some2');
89+
90+
$cache1 = (clone $tags1)->key('foo');
91+
$cache2 = (clone $tags2)->key('bar');
92+
93+
$this->assertNull($cache1->get());
94+
$this->assertNull($cache2->get());
95+
96+
$cache1->put('qwe');
97+
$cache2->put('rty');
98+
99+
$this->assertSame('qwe', $cache1->get());
100+
$this->assertSame('rty', $cache2->get());
101+
102+
$tags1->flush();
103+
104+
$this->assertNull($cache1->get());
105+
$this->assertSame('rty', $cache2->get());
79106
}
80107

81108
public function testHas()

‎tests/Cache/When/Simple/FileTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,47 @@ public function testForget()
6464
$this->assertNull($this->cache()->get());
6565
}
6666

67-
public function testFlush()
67+
public function testFlushByKeys()
6868
{
69-
$tags = Cache::make()->tags('foo', 'bar');
70-
$cache = (clone $tags)->key('qwerty');
69+
$cache1 = Cache::make()->key('foo');
70+
$cache2 = Cache::make()->key('bar');
7171

72-
$this->assertNull($cache->get());
72+
$this->assertNull($cache1->get());
73+
$this->assertNull($cache2->get());
7374

74-
$cache->put('asd');
75+
$cache1->put('qwe');
76+
$cache2->put('rty');
7577

76-
$this->assertSame('asd', $cache->get());
78+
$this->assertSame('qwe', $cache1->get());
79+
$this->assertSame('rty', $cache2->get());
7780

78-
$tags->flush();
81+
$cache1->flush();
7982

80-
$this->assertNull($cache->get());
83+
$this->assertNull($cache1->get());
84+
$this->assertNull($cache2->get());
85+
}
86+
87+
public function testFlushByTags()
88+
{
89+
$tags1 = Cache::make()->tags('some1');
90+
$tags2 = Cache::make()->tags('some2');
91+
92+
$cache1 = (clone $tags1)->key('foo');
93+
$cache2 = (clone $tags2)->key('bar');
94+
95+
$this->assertNull($cache1->get());
96+
$this->assertNull($cache2->get());
97+
98+
$cache1->put('qwe');
99+
$cache2->put('rty');
100+
101+
$this->assertSame('qwe', $cache1->get());
102+
$this->assertSame('rty', $cache2->get());
103+
104+
$tags1->flush();
105+
106+
$this->assertNull($cache1->get());
107+
$this->assertNull($cache2->get());
81108
}
82109

83110
public function testHas()

‎tests/Cache/When/Simple/RedisTest.php‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,47 @@ public function testForget()
7373
$this->assertNull($this->cache(['cache'])->get());
7474
}
7575

76-
public function testFlush()
76+
public function testFlushByKeys()
7777
{
78-
$tags = Cache::make()->tags('foo', 'bar');
79-
$cache = (clone $tags)->key('qwerty');
78+
$cache1 = Cache::make()->key('foo');
79+
$cache2 = Cache::make()->key('bar');
8080

81-
$this->assertNull($cache->get());
81+
$this->assertNull($cache1->get());
82+
$this->assertNull($cache2->get());
8283

83-
$cache->put('asd');
84+
$cache1->put('qwe');
85+
$cache2->put('rty');
8486

85-
$this->assertSame('asd', $cache->get());
87+
$this->assertSame('qwe', $cache1->get());
88+
$this->assertSame('rty', $cache2->get());
8689

87-
$tags->flush();
90+
$cache1->flush();
8891

89-
$this->assertNull($cache->get());
92+
$this->assertNull($cache1->get());
93+
$this->assertNull($cache2->get());
94+
}
95+
96+
public function testFlushByTags()
97+
{
98+
$tags1 = Cache::make()->tags('some1');
99+
$tags2 = Cache::make()->tags('some2');
100+
101+
$cache1 = (clone $tags1)->key('foo');
102+
$cache2 = (clone $tags2)->key('bar');
103+
104+
$this->assertNull($cache1->get());
105+
$this->assertNull($cache2->get());
106+
107+
$cache1->put('qwe');
108+
$cache2->put('rty');
109+
110+
$this->assertSame('qwe', $cache1->get());
111+
$this->assertSame('rty', $cache2->get());
112+
113+
$tags1->flush();
114+
115+
$this->assertNull($cache1->get());
116+
$this->assertSame('rty', $cache2->get());
90117
}
91118

92119
public function testHas()

0 commit comments

Comments
 (0)