nbproject/genfiles.properties
| @@ -3,8 +3,8 @@ |
| build.xml.stylesheet.CRC32=651128d4@1.65.1.1 |
| # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. |
| # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. |
| -nbproject/build-impl.xml.data.CRC32=6b239bc3 |
| -nbproject/build-impl.xml.script.CRC32=87ab32d4 |
| +nbproject/build-impl.xml.data.CRC32=12adb8fc |
| +nbproject/build-impl.xml.script.CRC32=afc83849 |
| nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
nbproject/private/private.properties
| @@ -1,7 +1,7 @@ |
| -deploy.ant.properties.file=/Users/scase/Library/Application Support/NetBeans/8.1/tomcat80.properties |
| -j2ee.server.home=/Applications/apache-tomcat-8.0.30 |
| -j2ee.server.instance=tomcat80:home=/Applications/apache-tomcat-8.0.30 |
| +deploy.ant.properties.file=/home/od/.netbeans/8.1/tomcat80.properties |
| +j2ee.server.home=/opt/apache-tomcat-8.0.20 |
| +j2ee.server.instance=tomcat80:home=/opt/apache-tomcat-8.0.20 |
| javac.debug=true |
| javadoc.preview=true |
| selected.browser=default |
| -user.properties.file=/Users/scase/Library/Application Support/NetBeans/8.1/build.properties |
| +user.properties.file=/home/od/.netbeans/8.1/build.properties |
test/service_tests/STest.java
| @@ -5,7 +5,9 @@ |
| import java.util.Properties; |
| import org.codehaus.jettison.json.JSONArray; |
| import org.junit.Assert; |
| +import org.junit.Rule; |
| import org.junit.Test; |
| +import org.junit.rules.TestName; |
| |
| /** |
| * |
| @@ -13,21 +15,16 @@ |
| */ |
| public class STest { |
| |
| - private void runtest(String t) throws Exception { |
| + @Rule |
| + public TestName name = new TestName(); |
| + |
| + private void run() throws Exception { |
| String testFolder = new File(getClass().getCanonicalName().replace('.', '/')).getParent(); |
| - JSONArray r = ServiceTest2.run(new Properties(), "test/" + testFolder + "/" + t); |
| + JSONArray r = ServiceTest2.run(new Properties(), "test/" + testFolder + "/" + name.getMethodName() + ".json"); |
| Assert.assertTrue(r.getJSONObject(0).getInt("successful") == 1); |
| } |
| |
| - |
| - @Test() |
| - public void m_simpleservice_2_0__base() throws Exception { |
| - runtest("m_simpleservice_2.0-base.json"); |
| - } |
| - |
| - |
| - @Test |
| - public void m_simpleservice_2_0__variant() throws Exception { |
| - runtest("m_simpleservice_2.0-variant.json"); |
| - } |
| + @Test public void m_simpleservice_2_0__base() throws Exception { run(); } |
| + @Test public void m_simpleservice_2_0__variant() throws Exception { run(); } |
| + @Test public void m_simpleservice_2_0__zero() throws Exception { run(); } |
| } |