Permalink
Browse files

Merge branch 'master' of github.com:aidGer/aidGer

  • Loading branch information...
2 parents db01bcd + e57effe commit b7d5cbf6788e99cc63cfe94a781375f116fc1e53 @Philly Philly committed May 18, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −1 build.xml
  2. +2 −2 tests/de/aidger/model/AbstractModelTest.java
View
@@ -142,9 +142,10 @@
</target>
<target name="test" depends="compile-tests, prepare-tests" description="Runs JUnit tests">
- <junit dir="${basedir}" printSummary="on" fork="true" haltonfailure="false">
+ <junit dir="${basedir}" fork="true" haltonfailure="true">
<sysproperty key="basedir" value="${basedir}" />
<env key="AIDGER_TEST" value="true" />
+ <formatter type="plain" usefile="false" />
<formatter type="xml" />
<classpath>
<path refid="build.classpath.test" />
@@ -62,7 +62,7 @@ public static void beforeClassSetUp() {
}
@Rule
- ExpectedException exception = ExpectedException.none();
+ public ExpectedException exception = ExpectedException.none();
/**
* Test of getAll method, of class AbstractModel.
@@ -147,7 +147,7 @@ public void testGetByKeys() {
a.setQualification("g");
a.save();
- // re-implement
+ //TODO: re-implement
/*
Assistant res = new Assistant(a.getByKeys(a.getId()));

0 comments on commit b7d5cbf

Please sign in to comment.