6 files changed, 174 insertions, 231 deletions
diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json
index d88fd413c9..05bb099707 100644
--- a/tests/extension/ext/barfoo/composer.json
+++ b/tests/extension/ext/barfoo/composer.json
@@ -13,10 +13,12 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB BarFoo Extension"
+		"display-name": "phpBB BarFoo Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index b8fc544c01..d49aab47cd 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -13,10 +13,12 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Moo Extension"
+		"display-name": "phpBB Moo Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }
diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json
index 215e7d59db..9d2ed86a0c 100644
--- a/tests/extension/ext/vendor2/bar/composer.json
+++ b/tests/extension/ext/vendor2/bar/composer.json
@@ -12,10 +12,12 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Bar Extension"
+		"display-name": "phpBB Bar Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }
diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json
index 7b2a80f5d3..efcdfc338f 100644
--- a/tests/extension/ext/vendor2/foo/composer.json
+++ b/tests/extension/ext/vendor2/foo/composer.json
@@ -12,10 +12,12 @@
 			"role": "N/A"
 		}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB Foo Extension"
+		"display-name": "phpBB Foo Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index d9f8fbd1a4..067fd62581 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -32,22 +32,62 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$this->extension_manager = $this->create_extension_manager();
 	}
 
-	public function test_available()
+	public function test_all_available()
 	{
 		// barfoo and vendor3/bar should not listed due to missing composer.json. barfoo also has incorrect dir structure.
 		$this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo'), array_keys($this->extension_manager->all_available()));
 	}
 
-	public function test_enabled()
+	public function test_all_enabled()
 	{
 		$this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
 	}
 
-	public function test_configured()
+	public function test_all_configured()
 	{
 		$this->assertEquals(array('vendor/moo', 'vendor2/foo'), array_keys($this->extension_manager->all_configured()));
 	}
 
+	public function test_is_enabled()
+	{
+		$this->assertSame(true, $this->extension_manager->is_enabled('vendor2/foo'));
+		$this->assertSame(false, $this->extension_manager->is_enabled('vendor/moo'));
+		$this->assertSame(false, $this->extension_manager->is_enabled('vendor2/bar'));
+		$this->assertSame(false, $this->extension_manager->is_enabled('bertie/worlddominationplan'));
+	}
+
+	public function test_is_disabled()
+	{
+		$this->assertSame(false, $this->extension_manager->is_disabled('vendor2/foo'));
+		$this->assertSame(true, $this->extension_manager->is_disabled('vendor/moo'));
+		$this->assertSame(false, $this->extension_manager->is_disabled('vendor2/bar'));
+		$this->assertSame(false, $this->extension_manager->is_disabled('bertie/worlddominationplan'));
+	}
+
+	public function test_is_purged()
+	{
+		$this->assertSame(false, $this->extension_manager->is_purged('vendor2/foo'));
+		$this->assertSame(false, $this->extension_manager->is_purged('vendor/moo'));
+		$this->assertSame(true, $this->extension_manager->is_purged('vendor2/bar'));
+		$this->assertSame(false, $this->extension_manager->is_purged('bertie/worlddominationplan'));
+	}
+
+	public function test_is_configured()
+	{
+		$this->assertSame(true, $this->extension_manager->is_configured('vendor2/foo'));
+		$this->assertSame(true, $this->extension_manager->is_configured('vendor/moo'));
+		$this->assertSame(false, $this->extension_manager->is_configured('vendor2/bar'));
+		$this->assertSame(false, $this->extension_manager->is_configured('bertie/worlddominationplan'));
+	}
+
+	public function test_is_available()
+	{
+		$this->assertSame(true, $this->extension_manager->is_available('vendor2/foo'));
+		$this->assertSame(true, $this->extension_manager->is_available('vendor/moo'));
+		$this->assertSame(true, $this->extension_manager->is_available('vendor2/bar'));
+		$this->assertSame(false, $this->extension_manager->is_available('bertie/worlddominationplan'));
+	}
+
 	public function test_enable()
 	{
 		vendor2\bar\ext::$state = 0;
@@ -95,7 +135,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 	protected function create_extension_manager($with_cache = true)
 	{
 
-		$config = new \phpbb\config\config(array());
+		$config = new \phpbb\config\config(array('version' => PHPBB_VERSION));
 		$db = $this->new_dbal();
 		$db_tools = new \phpbb\db\tools($db);
 		$phpbb_root_path = __DIR__ . './../../phpBB/';
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 3678ac0a3f..535e4fe0d5 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -19,8 +19,11 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 	protected $cache;
 	protected $config;
 	protected $db;
+	protected $db_tools;
+	protected $table_prefix;
 	protected $phpbb_root_path;
 	protected $phpEx;
+	protected $migrator;
 	protected $template;
 	protected $user;
 
@@ -50,6 +53,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 					new phpbb_mock_request()
 				),
 				new \phpbb\filesystem(),
+				$this->getMock('\phpbb\request\request'),
 				$this->phpbb_root_path,
 				$this->phpEx
 			),
@@ -70,7 +74,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			new \phpbb\db\migration\helper()
 		);
 		$container = new phpbb_mock_container_builder();
-		$container->set('migrator', $migrator);
+		$container->set('migrator', $this->migrator);
 
 		$this->extension_manager = new \phpbb\extension\manager(
 			$container,
@@ -96,9 +100,10 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		{
 			$manager->get_metadata();
 		}
-		catch(\phpbb\extension\exception $e){}
-
-		$this->assertEquals((string) $e, $this->user->lang('FILE_NOT_FOUND', $this->phpbb_root_path . $this->extension_manager->get_extension_path($ext_name) . 'composer.json'));
+		catch (\phpbb\extension\exception $e)
+		{
+			$this->assertEquals((string) $e, $this->user->lang('FILE_NOT_FOUND', $this->phpbb_root_path . $this->extension_manager->get_extension_path($ext_name) . 'composer.json'));
+		}
 	}
 
 	// Should be the same as a direct json_decode of the composer.json file
@@ -112,7 +117,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		{
 			$metadata = $manager->get_metadata();
 		}
-		catch(\phpbb\extension\exception $e)
+		catch (\phpbb\extension\exception $e)
 		{
 			$this->fail($e);
 		}
@@ -122,64 +127,42 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$this->assertEquals($metadata, $json);
 	}
 
-	public function test_validator_non_existant()
+	public function validator_non_existing_data()
 	{
-		$ext_name = 'validator';
-
-		$manager = $this->get_metadata_manager($ext_name);
-
-		// Non-existant data
-		try
-		{
-			$manager->validate('name');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'name'));
-		}
-
-		try
-		{
-			$manager->validate('type');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'type'));
-		}
-
-		try
-		{
-			$manager->validate('license');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'license'));
-		}
+		return array(
+			array('name'),
+			array('type'),
+			array('license'),
+			array('version'),
+		);
+	}
 
+	/**
+	* @dataProvider validator_non_existing_data
+	*/
+	public function test_validator_non_existing($field_name)
+	{
+		$manager = $this->get_metadata_manager('validator');
 		try
 		{
-			$manager->validate('version');
-
+			$manager->validate($field_name);
 			$this->fail('Exception not triggered');
 		}
 		catch(\phpbb\extension\exception $e)
 		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'version'));
+			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', $field_name));
 		}
+	}
 
+	public function test_validator_non_existing_authors()
+	{
+		$manager = $this->get_metadata_manager('validator');
 		try
 		{
 			$manager->validate_authors();
-
 			$this->fail('Exception not triggered');
 		}
-		catch(\phpbb\extension\exception $e)
+		catch (\phpbb\extension\exception $e)
 		{
 			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'authors'));
 		}
@@ -193,72 +176,44 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		try
 		{
 			$manager->validate_authors();
-
 			$this->fail('Exception not triggered');
 		}
-		catch(\phpbb\extension\exception $e)
+		catch (\phpbb\extension\exception $e)
 		{
 			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_NOT_SET', 'author name'));
 		}
 	}
 
-
-	public function test_validator_invalid()
+	public function validator_invalid_data()
 	{
-		$ext_name = 'validator';
+		return array(
+			array('name', 'asdf'),
+			array('type', 'asdf'),
+			array('license', ''),
+			array('version', ''),
+		);
+	}
 
-		$manager = $this->get_metadata_manager($ext_name);
+	/**
+	 * @dataProvider validator_invalid_data
+	 */
+	public function test_validator_invalid($field_name, $field_value)
+	{
+		$manager = $this->get_metadata_manager('validator');
 
 		// Invalid data
 		$manager->set_metadata(array(
-			'name'		=> 'asdf',
-			'type'		=> 'asdf',
-			'license'	=> '',
-			'version'	=> '',
+			$field_name		=> $field_value,
 		));
 
 		try
 		{
-			$manager->validate('name');
-
+			$manager->validate($field_name);
 			$this->fail('Exception not triggered');
 		}
 		catch(\phpbb\extension\exception $e)
 		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_INVALID', 'name'));
-		}
-
-		try
-		{
-			$manager->validate('type');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_INVALID', 'type'));
-		}
-
-		try
-		{
-			$manager->validate('license');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_INVALID', 'license'));
-		}
-
-		try
-		{
-			$manager->validate('version');
-
-			$this->fail('Exception not triggered');
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_INVALID', 'version'));
+			$this->assertEquals((string) $e, $this->user->lang('META_FIELD_INVALID', $field_name));
 		}
 	}
 
@@ -286,143 +241,83 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		}
 	}
 
-
-	public function test_validator_requirements()
+	public function validator_requirements_data()
 	{
-		$ext_name = 'validator';
-
-		$manager = $this->get_metadata_manager($ext_name);
-		// Too high of requirements
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> '10.0.0',
-				'phpbb/phpbb'		=> '3.2.0', // config is set to 3.1.0
+		return array(
+			array(
+				'10.0.0',
+				'100.2.0',
+				false,
+				false,
+				'Versions are not compared at the moment',
 			),
-		));
-
-		try
-		{
-			//$this->assertEquals(false, $manager->validate_require_php());
-			//$this->assertEquals(false, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
-
-
-		// Too high of requirements
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> '5.3.0',
-				'phpbb/phpbb'		=> '3.1.0-beta', // config is set to 3.1.0
+			array(
+				'5.3.0',
+				'3.1.0-beta',
+				true,
+				true,
 			),
-		));
-
-		try
-		{
-			$this->assertEquals(true, $manager->validate_require_php());
-			$this->assertEquals(true, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
-
-
-		// Too high of requirements
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> '>' . phpversion(),
-				'phpbb/phpbb'		=> '>3.1.0', // config is set to 3.1.0
+			array(
+				'>' . phpversion(),
+				'>3.1.0',
+				false,
+				false,
+				'Versions are not compared at the moment',
 			),
-		));
-
-		try
-		{
-			//$this->assertEquals(false, $manager->validate_require_php());
-			//$this->assertEquals(false, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
-
-
-		// Too high of current install
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> '<' . phpversion(),
-				'phpbb/phpbb'		=> '<3.1.0', // config is set to 3.1.0
+			array(
+				'<' . phpversion(),
+				'<3.1.0',
+				false,
+				false,
+				'Versions are not compared at the moment',
 			),
-		));
-
-		try
-		{
-			//$this->assertEquals(false, $manager->validate_require_php());
-			//$this->assertEquals(false, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
-
-
-		// Matching requirements
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> phpversion(),
-				'phpbb/phpbb'		=> '3.1.0', // config is set to 3.1.0
+			array(
+				phpversion(),
+				'3.1.0',
+				true,
+				true,
 			),
-		));
-
-		try
-		{
-			$this->assertEquals(true, $manager->validate_require_php());
-			$this->assertEquals(true, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
-
-
-		// Matching requirements
-		$manager->merge_metadata(array(
-			'require'		=> array(
-				'php'		=> '>=' . phpversion(),
-				'phpbb/phpbb'		=> '>=3.1.0', // config is set to 3.1.0
+			array(
+				'>=' . phpversion(),
+				'>=3.1.0',
+				true,
+				true,
 			),
-		));
+			array(
+				'<=' . phpversion(),
+				'<=3.1.0',
+				true,
+				true,
+			),
+		);
+	}
 
-		try
-		{
-			$this->assertEquals(true, $manager->validate_require_php());
-			$this->assertEquals(true, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
+	/**
+	* @dataProvider validator_requirements_data
+	*/
+	public function test_validator_requirements($php_version, $phpbb_version, $expected_php, $expected_phpbb, $incomplete_reason = '')
+	{
+		if ($incomplete_reason)
 		{
-			$this->fail($e);
+			$this->markTestIncomplete($incomplete_reason);
 		}
 
-
-		// Matching requirements
+		$ext_name = 'validator';
+		$manager = $this->get_metadata_manager($ext_name);
+		// Too high of requirements
 		$manager->merge_metadata(array(
 			'require'		=> array(
-				'php'		=> '<=' . phpversion(),
-				'phpbb/phpbb'		=> '<=3.1.0', // config is set to 3.1.0
+				'php'		=> $php_version,
+			),
+			'extra'		=> array(
+				'soft-require'	=> array(
+					'phpbb/phpbb'		=> $phpbb_version, // config is set to 3.1.0
+				),
 			),
 		));
 
-		try
-		{
-			$this->assertEquals(true, $manager->validate_require_php());
-			$this->assertEquals(true, $manager->validate_require_phpbb());
-		}
-		catch(\phpbb\extension\exception $e)
-		{
-			$this->fail($e);
-		}
+		$this->assertEquals($expected_php, $manager->validate_require_php());
+		$this->assertEquals($expected_phpbb, $manager->validate_require_phpbb());
 	}
 
 	/**