From a9a982b7dbb1766ae21eb1f5d6d63cbc03e2d0b7 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 16 Sep 2016 07:59:48 +0100
Subject: [PATCH] Updated sharp printer discovery and test unit

---
 includes/definitions.inc.php               | 2 +-
 includes/discovery/os/sharp.inc.php        | 6 ++++++
 includes/discovery/os/sharpprinter.inc.php | 7 -------
 tests/OSDiscoveryTest.php                  | 7 +++++++
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 includes/discovery/os/sharp.inc.php
 delete mode 100644 includes/discovery/os/sharpprinter.inc.php

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 2a63c07fbd..012c6ce003 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1538,7 +1538,7 @@ $config['os'][$os]['icon']             = 'ricoh';
 $config['os'][$os]['over'][0]['graph'] = 'device_toner';
 $config['os'][$os]['over'][0]['text']  = 'Toner';
 
-$os = 'sharpprinter';
+$os = 'sharp';
 $config['os'][$os]['group']            = 'printer';
 $config['os'][$os]['text']             = 'Sharp Printer';
 $config['os'][$os]['type']             = 'printer';
diff --git a/includes/discovery/os/sharp.inc.php b/includes/discovery/os/sharp.inc.php
new file mode 100644
index 0000000000..5b93c93f3c
--- /dev/null
+++ b/includes/discovery/os/sharp.inc.php
@@ -0,0 +1,6 @@
+<?php
+if (!$os) {
+    if (strstr($sysDescr, 'SHARP MX-')) {
+        $os = 'sharp';
+    }
+}
diff --git a/includes/discovery/os/sharpprinter.inc.php b/includes/discovery/os/sharpprinter.inc.php
deleted file mode 100644
index 1827fb945d..0000000000
--- a/includes/discovery/os/sharpprinter.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-if (!$os) {
-    // Sharp Multifunction Printer/Scanner
-    if (strstr($sysDescr, 'SHARP MX-')) {
-        $os = 'sharpprinter';
-    }
-}
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 94edcdfc7d..fa7670a93d 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -172,6 +172,13 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('qnap', 'Linux', '', $mockSnmp);
     }
 
+    public function testSharp()
+    {
+        $this->checkOS('sharp', 'SHARP MX-2614N');
+        $this->checkOS('sharp', 'SHARP MX-C301W');
+        $this->checkOS('sharp', 'SHARP MX-3140N');
+    }
+
     public function testSophos()
     {
         $this->checkOS('sophos', 'Linux g56fa85e');