Changeset 1315

Show
Ignore:
Timestamp:
01/31/08 09:01:26 (7 months ago)
Author:
mikey
Message:

backlash for refactoring #118: remove SimpleTest?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/build/stubbles-ioc/build.xml

    r1153 r1315  
    1010  </path> 
    1111   
    12   <taskdef name="mySimpletest" classname="MySimpleTestTask" classpath="${stubbles.base.dir}/src/test" /> 
    1312  <taskdef name="minifyJs" classname="stubJsMinTask" classpathref="phing.tasks.classpath" /> 
    1413  <taskdef name="checkStyle" classname="stubCheckStyleTask" classpathref="phing.tasks.classpath" /> 
     
    6059         version="${version}" 
    6160         title="Stubbles Inversion of Control" 
    62          package="net.stubbles.ioc" 
     61         package="net::stubbles::ioc" 
    6362         author="Stubbles Development Team &lt;http://stubbles.net&gt;" 
    6463         copyright="Stubbles Development Team" 
    65          preface="&lt;?php require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; ?&gt;${stubClassLoader}" 
     64         preface="&lt;?php require 'star://' . __FILE__ . '?org::stubbles::star::StarClassRegistry'; ?&gt;${stubClassLoader}" 
    6665         baseSrcPath="${stubbles.base.dir}/src/main"> 
    6766      <fileset dir="${stubbles.base.dir}/src/main"> 
     
    6968        <include name="**/net/stubbles/ioc/**/*.php" /> 
    7069        <include name="**/net/stubbles/reflection/**/*.php" /> 
    71         <include name="**/net/stubbles/star/StarClassRegistry.php" /> 
     70        <include name="**/org/stubbles/star/StarClassRegistry.php" /> 
    7271      </fileset> 
    7372    </buildStar> 
     
    9089  <target name="test" description="run test suite"> 
    9190    <phingcall target="test-preparation" /> 
    92     <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/run.php&quot;" exit="true" /> 
    93     <!-- run two times, this time with the data cached --> 
    94     <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/run.php&quot;" exit="true" /> 
     91    <exec passthru="true" command="phpunit src_test_AllTests"/> 
    9592  </target> 
    9693 
    9794  <target name="test-integration"> 
    9895    <phingcall target="test-preparation" /> 
    99     <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/runIntegration.php&quot;" exit="true" /> 
    100     <!-- run two times, this time with the data cached --> 
    101     <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/runIntegration.php&quot;" exit="true" /> 
     96    <exec passthru="true" command="phpunit src_test_IntegrationTests"/> 
    10297  </target> 
    10398 
     
    111106  </target> 
    112107 
    113   <target name="check-style" description="check coding standards"> 
     108  <target name="check-style" description="check coding standards with PHP_CodeSniffer"> 
    114109    <echo>----------------------------------</echo> 
    115110    <echo>| Checking CS of source files    |</echo> 
    116111    <echo>----------------------------------</echo> 
    117     <checkStyle failonerror="true"> 
    118       <fileset dir="${stubbles.base.dir}/src/main"> 
    119         <include name="**/net/stubbles/lang/**/*.php" /> 
    120         <include name="**/net/stubbles/ioc/**/*.php" /> 
    121         <include name="**/net/stubbles/reflection/**/*.php" /> 
    122       </fileset> 
    123     </checkStyle> 
     112    <property name="check.path" value="main"/> 
     113    <echo message="currently 'check.path' is set to '${check.path}'"/> 
     114    <input propertyname="namespace" promptChar=":">which stubbles namespace should be checked</input> 
     115    <if> 
     116      <or> 
     117        <os family="mac"/> 
     118        <os family="unix"/> 
     119      </or> 
     120      <then> 
     121        <!-- normal slashes --> 
     122        <exec command="phpcs --standard=${stubbles.base.dir}/src/main/php/org/stubbles/codeSniffer/Stubbles ${stubbles.base.dir}/src/${check.path}/php/net/stubbles/${namespace}" passthru="true"/> 
     123      </then> 
     124      <elseif> 
     125        <os family="windows"/> 
     126        <then> 
     127          <!-- must be backslashes in first case or PHP_CodeSniffer doesn't find own sniffs --> 
     128          <exec command="phpcs --standard=${stubbles.base.dir}\src\main\php\org\stubbles\codeSniffer\Stubbles ${stubbles.base.dir}/src/${check.path}/php/net/stubbles/${namespace}" passthru="true"/> 
     129        </then> 
     130      </elseif> 
     131    </if> 
    124132  </target> 
    125133</project>