Skip to content

Commit

Permalink
Merge pull request molgenis#148 from molgenis/testing
Browse files Browse the repository at this point in the history 
EOS27 merge
  • Loading branch information
@ChaoPang
ChaoPang committed Nov 27, 2012
2 parents 55e246b + f4cbac0 commit 1303fe5
Show file tree
Hide file tree
Showing 347 changed files with 6,847 additions and 2,932 deletions.
95 changes: 80 additions & 15 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<classpathentry kind="src" path="test/resources"/>
<classpathentry kind="src" path="test/java"/>
<classpathentry excluding="org/molgenis/framework/ui/res/lib/" kind="src" path="src"/>
<classpathentry kind="src" path="generated/java"/>
<classpathentry kind="src" path="generated/test/java"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Expand Down Expand Up @@ -492,15 +491,31 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate/hibernate-search-3.4.1.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.0.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/hibernate/hibernate-search-3.4.1.Final.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.0.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/quartz-1.6.0.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/gson-2.2.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
Expand Down Expand Up @@ -531,20 +546,70 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/cxf-bundle-minimal-2.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cxf-bundle-minimal-2.5.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/tjws-1.98.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.25.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/simplecaptcha-1.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/keggapi.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mindterm.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.semanticweb.HermiT.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ontocat-0.9.9.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mockito-all-1.9.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-email-1.2.jar"/>
<classpathentry kind="lib" path="lib/findbugs-2.0.1/lib/annotations.jar"/>
<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.25.0.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/simplecaptcha-1.2.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/keggapi.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/mindterm.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/org.semanticweb.HermiT.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/ontocat-0.9.9.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/mockito-all-1.9.5.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/commons-email-1.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/findbugs-2.0.1/lib/annotations.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/spring-test-3.1.2.RELEASE.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/spring-core-3.1.2.RELEASE.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ build/
target/
tmp/

<<<<<<< HEAD
*.class
*,so
*,si
Expand Down
9 changes: 6 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<property name="dir.classes" value="${dir.build}/classes" />
<property name="dir.javadoc" value="${dir.build}/javadoc" />
<property name="dir.test.src" value="test/java" />
<property name="dir.generated.test.src" value="generated/test/java" />
<property name="dir.test.resources" value="test/resources" />
<property name="dir.test.classes" value="${dir.build}/test/classes" />
<property name="testng.report.dir" value="${dir.build}/test/output" />
Expand Down Expand Up @@ -62,14 +63,16 @@
</copy>

<!-- compile the tests -->
<javac srcdir="${dir.test.src}" destdir="${dir.test.classes}" debug="true" includeantruntime="false">
<javac srcdir="${dir.test.src}:${dir.generated.test.src}" destdir="${dir.test.classes}" debug="true" includeantruntime="false">
<compilerarg value="-Xlint"/>
<classpath refid="test.classpath" />
</javac>

<testng outputDir="${testng.report.dir}" haltOnFailure="true">
<testng outputDir="${testng.report.dir}" haltOnFailure="true">
<classpath location="${cb.instrument.dir}" />
<sysproperty key="net.sourceforge.cobertura.datafile" value="${cb.file}" />
<classpath location="${dir.src}" />
<classpath location="${dir.generated.test.src}" />
<classpath refid="cb.classpath" />
<classpath refid="test.classpath"/>
<classpath location="${dir.test.classes}" />
Expand Down Expand Up @@ -151,7 +154,7 @@
</findbugs>
</target>

<target name="findbugs-html" depends="compile">
<target name="findbugs.html" depends="compile">
<mkdir dir="${dir.build}" />
<findbugs home="${findbugs.home}"
output="html" outputFile="${dir.build}/findbugs.html"
Expand Down
Loading

0 comments on commit 1303fe5

Please sign in to comment.