From 52ceecd93a572d9afd4ceaf236ccb1b7dde821fd Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 6 Jan 2014 15:03:03 -0500
Subject: [PATCH] Dependency injection for Mobile class. - Added tests.
---
module/VuFindTheme/src/VuFindTheme/Mobile.php | 21 +++++-
.../src/VuFindTest/ThemeMobileTest.php | 73 +++++++++++++++++++
2 files changed, 92 insertions(+), 2 deletions(-)
create mode 100644 module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeMobileTest.php
diff --git a/module/VuFindTheme/src/VuFindTheme/Mobile.php b/module/VuFindTheme/src/VuFindTheme/Mobile.php
index c654d87968b..526efd6be75 100644
--- a/module/VuFindTheme/src/VuFindTheme/Mobile.php
+++ b/module/VuFindTheme/src/VuFindTheme/Mobile.php
@@ -32,6 +32,7 @@
* @link http://code.google.com/p/mobileesp/ MobileESP Project
*/
namespace VuFindTheme;
+use uagent_info;
/**
* Mobile Device Detection Wrapper
@@ -44,6 +45,13 @@ namespace VuFindTheme;
*/
class Mobile
{
+ /**
+ * Mobile detection object
+ *
+ * @var uagent_info
+ */
+ protected $detector;
+
/**
* Are mobile themes enabled?
*
@@ -51,6 +59,16 @@ class Mobile
*/
protected $enabled = false;
+ /**
+ * Constructor
+ *
+ * @param uagent_info $detector Detector object to wrap (null to create one)
+ */
+ public function __construct(uagent_info $detector = null)
+ {
+ $this->detector = (null === $detector) ? new uagent_info() : $detector;
+ }
+
/**
* Function to detect if a mobile device is being used.
*
@@ -61,8 +79,7 @@ class Mobile
// Do the most exhaustive device detection possible; other method calls
// may be used instead of DetectMobileLong if you want to target a narrower
// class of devices.
- $mobile = new \uagent_info();
- return $mobile->DetectMobileLong();
+ return $this->detector->DetectMobileLong();
}
/**
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeMobileTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeMobileTest.php
new file mode 100644
index 00000000000..eec25bcc7ce
--- /dev/null
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeMobileTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Mobile Test Class
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category VuFind2
+ * @package Tests
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+namespace VuFindTest;
+use VuFindTheme\Mobile;
+
+/**
+ * Mobile Test Class
+ *
+ * @category VuFind2
+ * @package Tests
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+class ThemeMobileTest extends Unit\TestCase
+{
+ /**
+ * Test namespace stripping.
+ *
+ * @return void
+ */
+ public function testEnable()
+ {
+ $mobile = new Mobile();
+ // default behavior
+ $this->assertFalse($mobile->enabled());
+ // turn on
+ $mobile->enable();
+ $this->assertTrue($mobile->enabled());
+ // turn off
+ $mobile->enable(false);
+ $this->assertFalse($mobile->enabled());
+ }
+
+ /**
+ * Test detection wrapping.
+ *
+ * @return void
+ */
+ public function testDetection()
+ {
+ $detector = $this->getMock('uagent_info', array('DetectMobileLong'));
+ $detector->expects($this->once())
+ ->method('DetectMobileLong')->will($this->returnValue(true));
+ $mobile = new Mobile($detector);
+ $this->assertTrue($mobile->detect());
+ }
+}
\ No newline at end of file
--
GitLab