improved tests

Author: dg

tests/Bridges.Latte3/expected/cache.inc.php

@@ -1,12 +1,12 @@
 <?php
 %A%
-		if ($this->global->cache->createCache('%a%')) /* line %a% */
+		if ($this->global->cache->createCache('%a%')) /* %a% */
 		try {
 			echo '	';
-			echo LR\%a%(($this->filters->lower)($title)) /* line %a% */;
+			echo LR\%a%(($this->filters->lower)($title)) /* %a% */;
 			echo "\n";
 
-			$this->global->cache->end() /* line %a% */;
+			$this->global->cache->end() /* %a% */;
 		} catch (\Throwable $ʟ_e) {
 			$this->global->cache->rollback();
 			throw $ʟ_e;

tests/Bridges.Latte3/expected/cache.php

@@ -3,18 +3,18 @@
 		echo 'Noncached content
 
 ';
-		if ($this->global->cache->createCache('%a%', [$id, 'tags' => 'mytag'])) /* line %a% */
+		if ($this->global->cache->createCache('%a%', [$id, 'tags' => 'mytag'])) /* %a% */
 		try {
 			echo '
 <h1>';
-			echo LR\%a%(($this->filters->upper)($title)) /* line %a% */;
+			echo LR\%a%(($this->filters->upper)($title)) /* %a% */;
 			echo '</h1>
 
 ';
-			$this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, 'include')->renderToContentType('html') /* line %a% */;
+			$this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, 'include')->renderToContentType('html') /* %a% */;
 			echo "\n";
 
-			$this->global->cache->end() /* line %a% */;
+			$this->global->cache->end() /* %a% */;
 		} catch (\Throwable $ʟ_e) {
 			$this->global->cache->rollback();
 			throw $ʟ_e;

tests/Storages/FileStorage.sliding.bulk.phpt

@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+/**
+ * Test: Nette\Caching\Storages\FileStorage sliding expiration test.
+ */
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\FileStorage;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$key = 'nette';
+$value = 'rulez';
+
+$cache = new Cache(new FileStorage(getTempDir()));
+
+
+// Writing cache...
+$cache->save($key, $value, [
+	Cache::Expire => time() + 3,
+	Cache::Sliding => true,
+]);
+
+
+for ($i = 0; $i < 5; $i++) {
+	// Sleeping 1 second
+	sleep(1);
+	clearstatcache();
+
+	Assert::truthy($cache->bulkLoad([$key])[$key]);
+}
+
+// Sleeping few seconds...
+sleep(5);
+clearstatcache();
+
+Assert::null($cache->bulkLoad([$key])[$key]);

tests/Storages/Memcached.sliding.bulk.phpt

@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+/**
+ * Test: Nette\Caching\Storages\MemcachedStorage sliding expiration test.
+ */
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\MemcachedStorage;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+if (!MemcachedStorage::isAvailable()) {
+	Tester\Environment::skip('Requires PHP extension Memcached.');
+}
+
+Tester\Environment::lock('memcached-sliding', getTempDir());
+
+
+$key = 'nette-memcached-sliding-key';
+$value = 'rulez';
+
+$cache = new Cache(new MemcachedStorage('localhost'));
+
+
+// Writing cache...
+$cache->save($key, $value, [
+	Cache::Expire => time() + 3,
+	Cache::Sliding => true,
+]);
+
+
+for ($i = 0; $i < 5; $i++) {
+	// Sleeping 1 second
+	sleep(1);
+
+	Assert::truthy($cache->bulkLoad([$key])[$key]);
+}
+
+// Sleeping few seconds...
+sleep(5);
+
+Assert::null($cache->bulkLoad([$key])[$key]);

tests/Storages/Memcached.sliding.phpt

@@ -43,25 +43,3 @@ for ($i = 0; $i < 5; $i++) {
 sleep(5);
 
 Assert::null($cache->load($key));
-
-
-// Bulk
-
-// Writing cache...
-$cache->save($key, $value, [
-	Cache::Expire => time() + 3,
-	Cache::Sliding => true,
-]);
-
-
-for ($i = 0; $i < 5; $i++) {
-	// Sleeping 1 second
-	sleep(1);
-
-	Assert::truthy($cache->bulkLoad([$key])[$key]);
-}
-
-// Sleeping few seconds...
-sleep(5);
-
-Assert::null($cache->load([$key]));

tests/Storages/SQLiteStorage.sliding.bulk.phpt

@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+
+/**
+ * Test: Nette\Caching\Storages\SQLiteStorage expiration test.
+ * @phpExtension pdo_sqlite
+ */
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\SQLiteStorage;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$key = 'nette';
+$value = 'rulez';
+
+$cache = new Cache(new SQLiteStorage(':memory:'));
+
+
+// Writing cache...
+$cache->save($key, $value, [
+	Cache::Expire => time() + 3,
+	Cache::Sliding => true,
+]);
+
+
+for ($i = 0; $i < 5; $i++) {
+	// Sleeping 1 second
+	sleep(1);
+
+	Assert::truthy($cache->bulkLoad([$key])[$key]);
+}
+
+// Sleeping few seconds...
+sleep(5);
+
+Assert::null($cache->bulkLoad([$key])[$key]);

tests/Storages/SQLiteStorage.sliding.phpt

@@ -37,23 +37,3 @@ for ($i = 0; $i < 5; $i++) {
 sleep(5);
 
 Assert::null($cache->load($key));
-
-
-// Writing cache...
-$cache->save($key, $value, [
-	Cache::Expire => time() + 3,
-	Cache::Sliding => true,
-]);
-
-
-for ($i = 0; $i < 5; $i++) {
-	// Sleeping 1 second
-	sleep(1);
-
-	Assert::truthy($cache->bulkLoad([$key])[$key]);
-}
-
-// Sleeping few seconds...
-sleep(5);
-
-Assert::null($cache->bulkLoad([$key])[$key]);