Skip to content

Commit

Permalink
Merge pull request molgenis#101 from molgenis/testing
Browse files Browse the repository at this point in the history
EOS26 merge
  • Loading branch information
RoanKanninga committed Oct 31, 2012
2 parents 339b162 + 9122195 commit 55e246b
Show file tree
Hide file tree
Showing 594 changed files with 21,131 additions and 16,650 deletions.
20 changes: 16 additions & 4 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<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"/>
<classpathentry exported="true" kind="lib" path="lib/ant-apache-log4j.jar">
Expand Down Expand Up @@ -83,7 +87,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/freemarker.jar" sourcepath="/Users/jorislops/.m2/repository/org/freemarker/freemarker/2.3.16/freemarker-2.3.16-sources.jar">
<classpathentry exported="true" kind="lib" path="lib/freemarker.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
Expand Down Expand Up @@ -443,7 +447,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/hibernate/hibernate-jpa-2.0-api-1.0.0.Final.jar" sourcepath="/Users/jorislops/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final-sources.jar">
<classpathentry exported="true" kind="lib" path="lib/hibernate/hibernate-jpa-2.0-api-1.0.0.Final.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
Expand Down Expand Up @@ -528,11 +532,19 @@
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/cxf-bundle-minimal-2.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.19.0.jar"/>
<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 kind="output" path="bin"/>
</classpath>
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@

## Build folders

bin/
build/
tmp/
target/
tmp/

<<<<<<< HEAD
*.class
*,so
*,si
*,dll
*.o
*.tmp

## Always ignore these
*~
Expand All @@ -25,7 +35,7 @@ nbproject/private/
*.tmp
tmp*
log*
.classpath
/.externalToolBuilders
/.settings
/test-output
/target/
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.runtime.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
line.separator=\n
2 changes: 2 additions & 0 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="molgenis">
<wb-resource deploy-path="/" source-path="/src"/>
<wb-resource deploy-path="/" source-path="/test/resources"/>
<wb-resource deploy-path="/" source-path="/test/java"/>
</wb-module>
</project-modules>
18 changes: 0 additions & 18 deletions ant.xml

This file was deleted.

166 changes: 166 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="molgenis" basedir=".">
<property name="dir.lib" value="lib" />
<property name="dir.src" value="src" />
<property name="dir.build" value="build" />
<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.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" />
<property name="cb.file" location="${dir.build}/cobertura.ser" />
<property name="findbugs.home" value="${dir.lib}/findbugs-2.0.1" />

<!-- cobertura -->
<property name="cb.report.dir" value="${dir.build}/cobertura" />
<property name="cb.instrument.dir" value="${cb.report.dir}/cobertura-instrumented-classes" />


<path id="classpath">
<fileset dir="${dir.lib}" includes="**/*.jar" />
</path>

<target name="javadoc">
<javadoc access="public" destdir="${dir.javadoc}" author="true"
version="true" noindex="false" use="true" classpathref="classpath">
<fileset dir="${dir.src}" defaultexcludes="yes">
<include name="**/*.java" />
<exclude name="org/test/**/*.java" />
</fileset>
</javadoc>
</target>

<target name="clean">
<delete dir="${dir.build}" includeEmptyDirs="true" failonerror="false" />
</target>

<target name="compile">
<mkdir dir="${dir.classes}"/>
<javac srcdir="${dir.src}" destdir="${dir.classes}" debug="true" includeantruntime="false">
<compilerarg value="-Xlint"/>
<classpath refid="classpath" />
</javac>
</target>

<target name="test" depends="clean,compile,cb,findbugs" />

<path id="test.classpath">
<path refid="classpath" />
<pathelement location="${dir.classes}" />
</path>

<taskdef resource="testngtasks" classpathref="classpath" />

<target name="testng" depends="compile">
<mkdir dir="${dir.test.classes}"/>
<mkdir dir="${testng.report.dir}" />

<!-- copy the test resources -->
<copy todir="${dir.test.classes}" verbose="true">
<fileset dir="${dir.test.resources}" />
</copy>

<!-- compile the tests -->
<javac srcdir="${dir.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">
<classpath location="${cb.instrument.dir}" />
<sysproperty key="net.sourceforge.cobertura.datafile" value="${cb.file}" />
<classpath refid="cb.classpath" />
<classpath refid="test.classpath"/>
<classpath location="${dir.test.classes}" />
<classfileset dir="${dir.test.classes}" />
<jvmarg value="-noverify" />
</testng>
</target>

<!-- cobertura -->
<path id="cb.classpath">
<fileset dir="${dir.lib}/cobertura">
<include name="*.jar" />
</fileset>
</path>

<taskdef classpathref="cb.classpath" resource="tasks.properties" />

<target name="cb" depends="cb.gen, cb.xml, cb.html">
<delete file="${cb.file}" />
<delete dir="${cb.instrument.dir}" />
</target>

<target name="cb.instrument">
<mkdir dir="${cb.report.dir}" />
<cobertura-instrument todir="${cb.instrument.dir}/"
datafile="${cb.file}">
<fileset dir="${dir.classes}">
<include name="**/*.class" />
<exclude name="**/*Test.class" />
</fileset>
</cobertura-instrument>
</target>

<target name="init.cb.path">
<property name="test.cp" value="cb.test.cp" />
<path id="cb.test.cp">
<pathelement path="${cb.instrument.dir}" />
<pathelement path="${cb.classes.dir}" />
<path refid="classpath" />
</path>
</target>

<target name="cb.run" depends="init.cb.path, testng" />
<target name="cb.gen" depends="cb.instrument, cb.run" />

<target name="cb.html">
<cobertura-report format="html"
destdir="${cb.report.dir}"
datafile="${cb.file}">
<fileset dir="${dir.src}">
<include name="**/*.java" />
</fileset>
</cobertura-report>
</target>

<target name="cb.xml">
<cobertura-report format="xml"
destdir="${cb.report.dir}"
datafile="${cb.file}">
<fileset dir="${dir.src}">
<include name="**/*.java" />
</fileset>
</cobertura-report>
</target>

<!-- findbugs -->
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="classpath"/>

<target name="findbugs" depends="compile">
<mkdir dir="${dir.build}" />
<findbugs home="${findbugs.home}"
output="xml:withMessages" outputFile="${dir.build}/findbugs.xml"
jvmargs="-Xms1024M -Xmx1024M ">
<sourcePath path="${dir.src}" />
<class location="${dir.classes}" />
<auxclasspath>
<path refid="classpath" />
</auxclasspath>
</findbugs>
</target>

<target name="findbugs-html" depends="compile">
<mkdir dir="${dir.build}" />
<findbugs home="${findbugs.home}"
output="html" outputFile="${dir.build}/findbugs.html"
jvmargs="-Xms1024M -Xmx1024M ">
<sourcePath path="${dir.src}" />
<class location="${dir.classes}" />
<auxclasspath>
<path refid="classpath" />
</auxclasspath>
</findbugs>
</target>
</project>
57 changes: 57 additions & 0 deletions ivy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
you under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org.molgenis" module="molgenis"/>
<dependencies>
<!-- frameworks -->
<dependency org="log4j" name="log4j" rev="1.2.17" />
<dependency org="commons-logging" name="commons-logging"
rev="1.1.1" />
<dependency org="commons-lang" name="commons-lang" rev="2.4" />
<dependency org="commons-io" name="commons-io" rev="2.4" />
<dependency org="commons-fileupload" name="commons-fileupload"
rev="1.2.2" />
<dependency org="org.apache.commons" name="commons-email" rev="1.2"/>
<dependency org="org.freemarker" name="freemarker" rev="2.3.19" />
<dependency org="org.opensymphony.quartz" name="quartz"
rev="1.6.1" />

<!-- database -->
<dependency org="commons-dbcp" name="commons-dbcp" rev="1.4" />
<dependency org="org.hibernate" name="hibernate-entitymanager"
rev="3.5.6-Final" />
<dependency org="org.hibernate" name="hibernate-search"
rev="3.4.2.Final">
<exclude org="javax.jms" />
</dependency>

<!-- build and test -->
<dependency org="org.testng" name="testng" rev="6.4" />
<dependency org="org.apache.ant" name="ant" rev="1.8.4" />
<dependency org="ant" name="ant-apache-log4j" rev="1.6.5" />

<!-- files and systems -->
<dependency org="jexcelapi" name="jxl" rev="2.6" />
<dependency org="ch.ethz.ganymed" name="ganymed-ssh2" rev="build210" />
<dependency org="javatar" name="javatar" rev="2.5" />

<!-- xml, json, web services -->
<dependency org="com.google.code.gson" name="gson" rev="2.2.2" />
<dependency org="xerces" name="xerces" rev="2.4.0" />
<dependency org="org.apache.cxf" name="cxf-bundle-minimal"
rev="2.6.2" />
<dependency org="org.jboss.resteasy" name="tjws" rev="2.3.4.Final" />

</dependencies>
</ivy-module>
Binary file added lib/cobertura/asm-tree.jar
Binary file not shown.
Binary file added lib/cobertura/asm.jar
Binary file not shown.
Binary file added lib/cobertura/cobertura.jar
Binary file not shown.
Binary file added lib/cobertura/log4j.jar
Binary file not shown.
Binary file added lib/cobertura/oro.jar
Binary file not shown.
Binary file added lib/commons-email-1.2.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/annotations.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/ant.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-analysis-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-commons-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-tree-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-util-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/asm-xml-3.3.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/bcel.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/commons-lang-2.4.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/dom4j-1.6.1.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/findbugs-ant.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/findbugs.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/jFormatString.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/jaxen-1.1.1.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/jcip-annotations.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/jdepend-2.9.jar
Binary file not shown.
Binary file added lib/findbugs-2.0.1/lib/jsr305.jar
Binary file not shown.
Binary file not shown.
Binary file modified lib/freemarker.jar
Binary file not shown.
Binary file added lib/keggapi.jar
Binary file not shown.
Binary file added lib/mindterm.jar
Binary file not shown.
Binary file added lib/mockito-all-1.9.5.jar
Binary file not shown.
Binary file added lib/ontocat-0.9.9.1.jar
Binary file not shown.
Binary file added lib/org.semanticweb.HermiT.jar
Binary file not shown.
Binary file not shown.
Binary file added lib/simplecaptcha-1.2.1.jar
Binary file not shown.
Loading

0 comments on commit 55e246b

Please sign in to comment.