class-filename-convention

pear · Oct 30, 2011 · 1fbe60b · 1fbe60b
1 parent 6cd2e54
commit 1fbe60b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/package.xml b/package.xml
@@ -95,18 +95,24 @@ is the use of a factory pattern.  Again, see the examples.</description>
     <file name="AllTests.php" role="test">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
-    <file name="File_IMC_BugsTest.php" role="test">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-    </file>
-    <file name="File_IMC_BuildTest.php" role="test">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-    </file>
-    <file name="File_IMC_ParseTest.php" role="test">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-    </file>
-    <file name="File_IMC_Parse_VcalendarTest.php" role="test">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-    </file>
+    <dir name="File">
+     <dir name="IMC">
+      <file name="BugsTest.php" role="test">
+       <tasks:replace from="@package_version@" to="version" type="package-info" />
+      </file>
+      <file name="BuildTest.php" role="test">
+       <tasks:replace from="@package_version@" to="version" type="package-info" />
+      </file>
+      <file name="ParseTest.php" role="test">
+       <tasks:replace from="@package_version@" to="version" type="package-info" />
+      </file>
+      <dir name="Parse">
+       <file name="VcalendarTest.php" role="test">
+        <tasks:replace from="@package_version@" to="version" type="package-info" />
+       </file>
+      </dir>
+     </dir>
+    </dir>
     <file name="sample.vcf" role="test" />
     <file name="sample.vcs" role="test" />
     <file name="vcard-parse.phpt" role="test" />

diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -72,22 +72,22 @@
 /**
  * File_IMC_ParseTest
  */
-require_once 'File_IMC_ParseTest.php';
+require_once 'File/IMC/ParseTest.php';
 
 /**
  * File_IMC_Parse_VcalendarTest
  */
-require_once 'File_IMC_Parse_VcalendarTest.php';
+require_once 'File/IMC/Parse/VcalendarTest.php';
 
 /**
  * File_IMC_BuildTest
  */
-require_once 'File_IMC_BuildTest.php';
+require_once 'File/IMC/BuildTest.php';
 
 /**
  * File_IMC_BugsTest
  */
-require_once 'File_IMC_BugsTest.php';
+require_once 'File/IMC/BugsTest.php';
 
 /**
  * Master Unit Test Suite class for File_IMC

diff --git a/tests/File_IMC_BugsTest.php → tests/File/IMC/BugsTest.php b/tests/File_IMC_BugsTest.php → tests/File/IMC/BugsTest.php
diff --git a/tests/File_IMC_BuildTest.php → tests/File/IMC/BuildTest.php b/tests/File_IMC_BuildTest.php → tests/File/IMC/BuildTest.php
diff --git a/tests/File_IMC_Parse_VcalendarTest.php → tests/File/IMC/Parse/VcalendarTest.php b/tests/File_IMC_Parse_VcalendarTest.php → tests/File/IMC/Parse/VcalendarTest.php
@@ -61,7 +61,7 @@ public function setUp()
     {
         self::$parser = File_IMC::parse('vcalendar');
 
-        $calinfo = self::$parser->fromFile(dirname(__FILE__) . '/sample.vcs');
+        $calinfo = self::$parser->fromFile(dirname(__FILE__) . '/../../../sample.vcs');
 
         self::$calendar = $calinfo['VCALENDAR'][0];
     }
@@ -107,7 +107,7 @@ public function testVersion()
     public static function eventProvider()
     {
         $parser = File_IMC::parse('vcalendar');
-        $parser->fromFile(dirname(__FILE__) . '/sample.vcs');
+        $parser->fromFile(dirname(__FILE__) . '/../../../sample.vcs');
 
         $events = $parser->getEvents();
 

diff --git a/tests/File_IMC_ParseTest.php → tests/File/IMC/ParseTest.php b/tests/File_IMC_ParseTest.php → tests/File/IMC/ParseTest.php
@@ -264,7 +264,7 @@ public function testExampleParser($expect, $actual)
     public function testFromFile()
     {
         $parser = File_IMC::parse('vcard');
-        $parsed = $parser->fromFile(dirname(__FILE__) . '/sample.vcf');
+        $parsed = $parser->fromFile(dirname(__FILE__) . '/../../sample.vcf');
 
         $vcard = $parsed['VCARD'][0];