From 510fadcf43df801da2dea59094ba817b904cd2dd Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 11 Nov 2009 07:49:54 -0500
Subject: [PATCH] more code coverage fixes

---
 classes/ComicPressComicPost.inc  |  2 ++
 test/ComicPressComicPostTest.php | 28 +++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/classes/ComicPressComicPost.inc b/classes/ComicPressComicPost.inc
index db1fbbf..9159c39 100644
--- a/classes/ComicPressComicPost.inc
+++ b/classes/ComicPressComicPost.inc
@@ -83,6 +83,7 @@ class ComicPressComicPost {
     return false;
   }
 
+  // @codeCoverageIgnoreStart
   /**
    * Sort the remaining comic images by file date.
    * @param object $a
@@ -94,6 +95,7 @@ class ComicPressComicPost {
   	$b_date = isset($b->post_date) ? $b->post_date : 0;
   	return $a_date - $b_date;
   }
+  // @codeCoverageIgnoreEnd
 
   /**
    * Change the ordering of comic images in the associated post.
diff --git a/test/ComicPressComicPostTest.php b/test/ComicPressComicPostTest.php
index 9ed03a2..0680081 100644
--- a/test/ComicPressComicPostTest.php
+++ b/test/ComicPressComicPostTest.php
@@ -12,7 +12,12 @@ class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
 
   function providerTestNormalizeOrdering() {
   	return array(
-  		array(
+      array(
+        false,
+        array('attachment-1' => array('enabled' => false), 'attachment-2' => array('enabled' => true)),
+        false,
+      ),
+      array(
   			array('attachment-1'),
   			array(),
   			array('attachment-1' => array('enabled' => true))
@@ -27,6 +32,11 @@ class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
   			array('attachment-1' => array('enabled' => true, 'children' => array('rss' => array('attachment-2' => true)))),
   			array('attachment-1' => array('enabled' => true))
   		),
+      array(
+        array('attachment-1', 'attachment-2'),
+        array('attachment-1' => array('enabled' => true, 'children' => array('rss' => array('attachment-2' => true, 'attachment-3' => true)))),
+        array('attachment-1' => array('enabled' => true, 'children' => array('rss' => array('attachment-2' => true))))
+      ),
   		array(
   			array('attachment-1', 'attachment-2', 'attachment-3'),
   			array('attachment-1' => array('enabled' => false, 'children' => array('rss' => array('attachment-2' => true)))),
@@ -41,9 +51,13 @@ class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
   function testNormalizeOrdering($attachments, $current_meta, $expected_result) {
     $p = $this->getMock('ComicPressComicPost', array('get_attachments'));
 
-    $attachment_objects = array();
-    foreach ($attachments as $attachment) {
-    	$attachment_objects[] = (object)array('id' => $attachment);
+    if (is_array($attachments)) {
+      $attachment_objects = array();
+      foreach ($attachments as $attachment) {
+        $attachment_objects[] = (object)array('id' => $attachment);
+      }
+    } else {
+      $attachment_objects = $attachments;
     }
 
     $p->expects($this->any())->method('get_attachments')->will($this->returnValue($attachment_objects));
@@ -54,7 +68,11 @@ class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
     $p->post = (object)array('ID' => 1);
 
     $this->assertEquals($expected_result, $p->normalize_ordering());
-    $this->assertEquals($expected_result, get_post_meta(1, 'image-ordering', true));
+    if ($expected_result === false) {
+      $this->assertEquals($current_meta, get_post_meta(1, 'image-ordering', true));
+    } else {
+      $this->assertEquals($expected_result, get_post_meta(1, 'image-ordering', true));
+    }
   }
 
   function providerTestChangeComicImageOrdering() {