3 files changed, 108 insertions, 2 deletions
diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php
new file mode 100644
index 0000000000..96988c1028
--- /dev/null
+++ b/tests/console/cache/purge_test.php
@@ -0,0 +1,95 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use phpbb\console\command\cache\purge;
+
+require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
+
+class phpbb_console_command_cache_purge_test extends phpbb_test_case
+{
+	protected $cache_dir;
+	protected $cache;
+	protected $command_name;
+	protected $db;
+	protected $config;
+
+	public function __construct()
+	{
+		$this->cache_dir = dirname(__FILE__) . '/tmp/cache/';
+	}
+
+	protected function setUp()
+	{
+		if (file_exists($this->cache_dir))
+		{
+			// cache directory possibly left after aborted
+			// or failed run earlier
+			$this->remove_cache_dir();
+		}
+		$this->create_cache_dir();
+
+		$this->cache = new \phpbb\cache\driver\file($this->cache_dir);
+
+		$this->db = $this->getMock('\phpbb\db\driver\driver_interface');
+
+		$this->config = new \phpbb\config\config(array('assets_version' => 1));
+		$this->user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
+	}
+
+	public function test_purge()
+	{
+		$this->cache->put('test_key', 'test_value');
+
+		$this->assertEquals(
+			'test_value',
+			$this->cache->get('test_key'),
+			'File ACM put and get'
+		);
+
+		$command_tester = $this->get_command_tester();
+		$exit_status = $command_tester->execute(array('command' => $this->command_name));
+
+		$this->assertSame(false, $this->cache->get('test_key'));
+		$this->assertSame(2, $this->config['assets_version']);
+	}
+
+	private function create_cache_dir()
+	{
+		$this->get_test_case_helpers()->makedirs($this->cache_dir);
+	}
+
+	private function remove_cache_dir()
+	{
+		$iterator = new DirectoryIterator($this->cache_dir);
+		foreach ($iterator as $file)
+		{
+			if ($file != '.' && $file != '..')
+			{
+				unlink($this->cache_dir . '/' . $file);
+			}
+		}
+		rmdir($this->cache_dir);
+	}
+
+	public function get_command_tester()
+	{
+		$application = new Application();
+		$application->add(new purge($this->user, $this->cache, $this->db, $this->getMock('\phpbb\auth\auth'), new \phpbb\log\null(), $this->config));
+
+		$command = $application->find('cache:purge');
+		$this->command_name = $command->getName();
+		return new CommandTester($command);
+	}
+}
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
index 0f87abc180..f10402e8cb 100644
--- a/tests/datetime/from_format_test.php
+++ b/tests/datetime/from_format_test.php
@@ -60,7 +60,7 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
 		// If the current time is too close to the testing time,
 		// the relative time will use "x minutes ago" instead of "today ..."
 		// So we use 18:01 in the morning and 06:01 in the afternoon.
-		$testing_time = date('H') <= 12 ? '06:01' : '18:01';
+		$testing_time = date('H') <= 12 ? '18:01' : '06:01';
 
 		return array(
 			array(
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
index dc0e38544d..2e55a78d21 100644
--- a/tests/wrapper/gmgetdate_test.php
+++ b/tests/wrapper/gmgetdate_test.php
@@ -50,7 +50,18 @@ class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
 			$date_array['year']
 		);
 
-		$this->assertEquals($expected, $actual);
+		// Calling second-granularity time functions twice isn't guaranteed to
+		// give the same results. As long as they're in the right order, allow
+		// a 1 second difference.
+		$this->assertGreaterThanOrEqual(
+			$expected, $actual,
+			'Expected second time to be after (or equal to) the previous one'
+		);
+		$this->assertLessThanOrEqual(
+			1,
+			abs($actual - $expected),
+			"Expected $actual to be within 1 second of $expected."
+		);
 
 		if (isset($current_timezone))
 		{