Cleanup & tests

Author: danmichaelo

phpunit.xml

@@ -2,6 +2,11 @@
 	<testsuites>
 		<testsuite name="TestSuite">
 			<directory>tests/</directory>
-		</testsuite>
-	</testsuites>
-</phpunit>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src/</directory>
+    </whitelist>
+  </filter>
+</phpunit>

src/Exceptions/XmlException.php

@@ -4,11 +4,11 @@
 
 class XmlException extends \RuntimeException
 {
-	public function __construct($errors)
-	{
-		$details = array_map(function($error) {
-			return $error->message;
-		}, $errors);
-		parent::__construct('Failed loading XML: \n' . implode('\n', $details));
-	}
-}
+    public function __construct($errors)
+    {
+        $details = array_map(function ($error) {
+            return $error->message;
+        }, $errors);
+        parent::__construct('Failed loading XML: \n' . implode('\n', $details));
+    }
+}

src/Fields/Field.php

@@ -22,6 +22,5 @@ public function __get($key)
         if (method_exists($this, $method)) {
             return call_user_func(array($this, $method));
         }
-        // TODO: Throw something!
     }
 }

src/Fields/Isbn.php

@@ -8,10 +8,9 @@ public function __toString()
     {
         $a = $this->field->getSubfield('a');
         if (!$a) {
-            return;
+            return '';
         }
 
-        // TODO: Other subfields?
         return $a->getData();
     }
 }

src/Fields/Subject.php

@@ -34,12 +34,14 @@ public function getVocabulary()
     /**
      * Return the Authority record control number
      */
-    public function getControlNumber($value='')
+    public function getControlNumber()
     {
-        return $this->field->getSubfield('0');
+        $value = $this->field->getSubfield('0');
+        return $value ?: null;
     }
 
-    function getParts() {
+    public function getParts()
+    {
         $parts = array();
         foreach ($this->field->getSubfields() as $c) {
             if (in_array($c->getCode(), array('a', 'b', 'x', 'y', 'z'))) {

src/Fields/Title.php

@@ -15,10 +15,7 @@ public function __toString()
     {
         // $a is not repeated
         $a = $this->field->getSubfield('a');
-        if (!$a) {
-            return;
-        }
-        $title = trim($a->getData());
+        $title = $a ? trim($a->getData()) : '';
 
         // $b is not repeated
         $b = $this->field->getSubfield('b');

src/Record.php

@@ -154,12 +154,10 @@ public function __get($key)
         if (method_exists($this, $method)) {
             return call_user_func(array($this, $method));
         }
-        // TODO: Throw something!
     }
 
     public function __toString()
     {
         return strval($this->record);
     }
-
 }

tests/IsbnFieldTest.php

@@ -20,4 +20,20 @@ public function testIsbn()
         $record = Record::fromString($source);
         $this->assertEquals(array('8200424421'), $record->isbns);
     }
+
+    public function test020withoutA()
+    {
+        $source = '<?xml version="1.0" encoding="UTF-8" ?>
+          <record xmlns="http://www.loc.gov/MARC21/slim">
+            <leader>99999cam a2299999 u 4500</leader>
+            <controlfield tag="001">98218834x</controlfield>
+            <datafield tag="020" ind1=" " ind2=" ">
+              <subfield code="q">h.</subfield>
+              <subfield code="c">Nkr 98.00</subfield>
+            </datafield>
+          </record>';
+
+        $record = Record::fromString($source);
+        $this->assertEquals(array(''), $record->isbns);
+    }
 }

tests/SubjectFieldTest.php

@@ -38,6 +38,7 @@ public function testSubjects()
         $this->assertEquals('noubomn', $subject->vocabulary);
         $this->assertEquals('Elementærpartikler', strval($subject));
         $this->assertEquals('650', $subject->getTag('650'));
+        $this->assertNull($subject->getControlNumber());
 
         $subject = $record->subjects[3];
         $this->assertInstanceOf('Scriptotek\Marc\Fields\Subject', $subject);