3 files changed, 50 insertions, 2 deletions

diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index e87953367f..b8c48389e0 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -107,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
 
-		// Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the
+		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
 		// DISALLOWED_CONTENT check
-		$this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text());
+		$this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text());
 	}
 
 	public function test_too_large()
diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php
index b74a9f236e..fa53e6c8c4 100644
--- a/tests/mimetype/guesser_test.php
+++ b/tests/mimetype/guesser_test.php
@@ -206,4 +206,25 @@ class guesser_test extends \phpbb_test_case
 		$this->assertInstanceOf('\phpbb\mimetype\content_guesser', $guessers[0]);
 		$this->assertInstanceOf('\phpbb\mimetype\extension_guesser', $guessers[3]);
 	}
+
+	public function data_choose_mime_type()
+	{
+		return array(
+			array('application/octet-stream', 'application/octet-stream', null),
+			array('application/octet-stream', 'application/octet-stream', 'application/octet-stream'),
+			array('binary', 'application/octet-stream', 'binary'),
+			array('image/jpeg', 'application/octet-stream', 'image/jpeg'),
+			array('image/jpeg', 'binary', 'image/jpeg'),
+			array('image/jpeg', 'image/jpg', 'image/jpeg'),
+			array('image/jpeg', 'image/jpeg', 'binary'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_choose_mime_type
+	 */
+	public function test_choose_mime_type($expected, $mime_type, $guess)
+	{
+		$this->assertSame($expected, $this->guesser->choose_mime_type($mime_type, $guess));
+	}
 }
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 27e94d6a07..3832307897 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -205,6 +205,18 @@ class phpbb_path_helper_test extends phpbb_test_case
 				array('test' => 'xyz', 'var' => 'value'),
 				'test=xyz&var=value',
 			),
+			array(
+				array('test' => null),
+				'test',
+			),
+			array(
+				array('test' => null, 'var' => null),
+				'test&var',
+			),
+			array(
+				array('test' => 'xyz', 'var' => null, 'bar' => 'value'),
+				'test=xyz&var&bar=value',
+			),
 		);
 	}
 
@@ -254,6 +266,21 @@ class phpbb_path_helper_test extends phpbb_test_case
 				true,
 				array('base' => 'mcp.php', 'params' => array('f' => '3')),
 			),
+			array(
+				'index.php?ready',
+				false,
+				array('base' => 'index.php', 'params' => array('ready' => null)),
+			),
+			array(
+				'index.php?i=1&ready',
+				true,
+				array('base' => 'index.php', 'params' => array('i' => '1', 'ready' => null)),
+			),
+			array(
+				'index.php?ready&i=1',
+				false,
+				array('base' => 'index.php', 'params' => array('ready' => null, 'i' => '1')),
+			),
 		);
 	}