Merge pull request #7065 from owncloud/errorHandler_tests

add test for the password remove method

lib/private/log/errorhandler.php

@@ -19,7 +19,7 @@ class ErrorHandler {
 	 * @param string $msg
 	 * @return string
 	 */
-	private static function removePassword($msg) {
+	protected static function removePassword($msg) {
 		return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
 	}
 

tests/lib/errorHandler.php

+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class Test_ErrorHandler extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @brief provide username, password combinations for testRemovePassword
+	 * @return array
+	 */
+	function passwordProvider() {
+		return array(
+			array('user', 'password'),
+			array('user@owncloud.org', 'password'),
+			array('user', 'pass@word'),
+			array('us:er', 'password'),
+			array('user', 'pass:word'),
+			);
+
+	}
+
+	/**
+	 * @dataProvider passwordProvider
+	 * @param string $username
+	 * @param string $password
+	 */
+	function testRemovePassword($username, $password) {
+		$url = 'http://'.$username.':'.$password.'@owncloud.org';
+		$expectedResult = 'http://xxx:xxx@owncloud.org';
+		$result = TestableErrorHandler::testRemovePassword($url);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+}
+
+/**
+ * @brief dummy class to access protected methods of \OC\Log\ErrorHandler
+ */
+class TestableErrorHandler extends \OC\Log\ErrorHandler {
+	public static function testRemovePassword($msg) {
+		return self::removePassword($msg);
+	}
+}