Conversion unit tests

leodido · Dec 26, 2014 · f389ea1 · f389ea1
1 parent 6c35a49
commit f389ea1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/library/Conversion.php b/library/Conversion.php
@@ -277,11 +277,12 @@ public static function getOptionsFullQualifiedClassName($adapter)
         }
         if (!$adapter instanceof ConversionAlgorithmInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
-                '"%s" expects a string or an instance of ConversionAlgorithmInterface; received "%s"',
+                '"%s" expects an instance of ConversionAlgorithmInterface; received "%s"',
                 __METHOD__,
                 is_object($adapter) ? get_class($adapter) : gettype($adapter)
             ));
         }
+
         $adapterClass = get_class($adapter);
         $namespace = substr($adapterClass, 0, strrpos($adapterClass, '\\'));
         return $namespace . '\\Options\\' . $adapter->getName() . 'Options';

diff --git a/tests/ConversionTest.php b/tests/ConversionTest.php
@@ -80,6 +80,12 @@ public function testConstructor()
         $ctor->invoke($this->mock, $input);
     }
 
+    public function testGetOptionsFQCNWithNotAConversionAlgorithmInterfaceShouldThrowInvalidArgumentException()
+    {
+        $this->setExpectedException('Conversio\Exception\InvalidArgumentException');
+        Conversion::getOptionsFullQualifiedClassName(new \stdClass());
+    }
+
     public function testGetAdapterNotSetShouldThrowRuntimeException()
     {
         $filter = new Conversion();
@@ -269,6 +275,11 @@ public function testGetAdapterOptionsAndOptions()
         $this->assertEmpty($filter->getOptions());
         $this->assertEquals($fakeAdapterOpts, $filter->getAdapterOptions());
         $this->assertEquals($fakeAdapterOpts->toArray(), $filter->getOptions());
+
+        $this->assertEquals($fakeAdapterOpts->getFake(), $filter->getOptions('fake'));
+
+        $this->setExpectedException('Conversio\Exception\RuntimeException');
+        $filter->getOptions('not_exists');
     }
 
     public function testSetAdapterOptionsWithInvalidTypeInputShouldThrowInvalidArgumentException()
@@ -286,15 +297,14 @@ public function testSetAdapterOptionsWithInvalidTypeInputShouldThrowInvalidArgum
         $filter->setAdapterOptions('invalid');
     }
 
-    public function testFilterNotString()
+    public function testFilter()
     {
+        // Filtering a non string return the non strig input
         $notAString = [];
         $filter = new Conversion();
         $this->assertEquals($notAString, $filter->filter($notAString));
-    }
 
-    public function testFilter()
-    {
+        // Filtering
         $input = 'string';
 
         $adapterMock = $this->getMock('Conversio\ConversionAlgorithmInterface');