Index: tests/skinr.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/tests/skinr.test,v
retrieving revision 1.9
diff -u -p -r1.9 skinr.test
--- tests/skinr.test	16 Jan 2011 01:31:46 -0000	1.9
+++ tests/skinr.test	16 Jan 2011 16:39:53 -0000
@@ -190,10 +190,20 @@ class SkinrApiTestCase extends DrupalWeb
     )));
     unset($skin_info['skinr_test_basetheme']);
 
+    // skinr_test_subtheme is registered via hook_skinr_skin_info() in
+    // skinr_test_subtheme.skinr.inc.
+    $this->assertTrue(isset($skin_info['skinr_test_subtheme']), 'Skin registered in $subtheme.skinr.inc found.');
+    $this->assertEqual($skin_info['skinr_test_subtheme']['source']['path'], $path . '/tests/themes/skinr_test_subtheme', t('Skin path points to subtheme directory: @path', array(
+      '@path' => $skin_info['skinr_test_subtheme']['source']['path'],
+    )));
+    unset($skin_info['skinr_test_subtheme']);
+
     // Ensure that skinr_test_incompatible is not contained.
     $this->assertTrue(!isset($skin_info['skinr_test_incompatible']), 'Incompatible skin not found.');
     // After asserting all expected, the list of skins should be empty.
-    $this->assertTrue(empty($skin_info), 'No unexpected skins found.');
+    $this->assertTrue(empty($skin_info), t('No unexpected skins found: <pre>@data</pre>', array(
+      '@data' => var_export($skin_info, TRUE),
+    )));
   }
 
   /**
Index: tests/themes/skinr_test_basetheme_other/skinr_test_basetheme_other.skinr.inc
===================================================================
RCS file: tests/themes/skinr_test_basetheme_other/skinr_test_basetheme_other.skinr.inc
diff -N tests/themes/skinr_test_basetheme_other/skinr_test_basetheme_other.skinr.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/themes/skinr_test_basetheme_other/skinr_test_basetheme_other.skinr.inc	16 Jan 2011 16:31:17 -0000
@@ -0,0 +1,13 @@
+<?php
+// $Id$
+
+/**
+ * Implements hook_skinr_skin_info().
+ */
+function skinr_test_basetheme_other_skinr_skin_info() {
+  $skins['skinr_test_basetheme_other'] = array(
+    'title' => 'Other base theme skin',
+    'default status' => 1,
+  );
+  return $skins;
+}
Index: tests/themes/skinr_test_subtheme/skinr_test_subtheme.skinr.inc
===================================================================
RCS file: tests/themes/skinr_test_subtheme/skinr_test_subtheme.skinr.inc
diff -N tests/themes/skinr_test_subtheme/skinr_test_subtheme.skinr.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/themes/skinr_test_subtheme/skinr_test_subtheme.skinr.inc	16 Jan 2011 16:30:09 -0000
@@ -0,0 +1,13 @@
+<?php
+// $Id$
+
+/**
+ * Implements hook_skinr_skin_info().
+ */
+function skinr_test_subtheme_skinr_skin_info() {
+  $skins['skinr_test_subtheme'] = array(
+    'title' => 'Subtheme skin',
+    'default status' => 1,
+  );
+  return $skins;
+}
Index: tests/themes/skinr_test_subtheme_other/skinr_test_subtheme_other.skinr.inc
===================================================================
RCS file: tests/themes/skinr_test_subtheme_other/skinr_test_subtheme_other.skinr.inc
diff -N tests/themes/skinr_test_subtheme_other/skinr_test_subtheme_other.skinr.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/themes/skinr_test_subtheme_other/skinr_test_subtheme_other.skinr.inc	16 Jan 2011 16:30:39 -0000
@@ -0,0 +1,13 @@
+<?php
+// $Id$
+
+/**
+ * Implements hook_skinr_skin_info().
+ */
+function skinr_test_subtheme_other_skinr_skin_info() {
+  $skins['skinr_test_subtheme_other'] = array(
+    'title' => 'Other subtheme skin',
+    'default status' => 1,
+  );
+  return $skins;
+}