Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3fd9c1e1 by Tony CHEMIT at 2018-03-06T16:16:31Z fix some io tests - - - - - 4 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java @@ -42,6 +42,7 @@ import org.junit.Rule; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStreamWriter; import java.util.List; import java.util.Set; @@ -62,7 +63,7 @@ public abstract class AnalyzeInputSourceActionTestSupport { protected abstract MSAccessTestConfiguration createConfiguration(); @Before - public void setUp() throws Exception { + public void setUp() throws IOException { boolean initOk = serviceContext.isInitOk(); Assume.assumeTrue("Could not init db", initOk); MSAccessTestConfiguration msConfig = serviceContext.getMsConfig(); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java @@ -194,7 +194,7 @@ public class FakeT3AvdthServiceContext extends TestWatcher implements T3ServiceC if (msConfig != null) { boolean b = msConfig.beforeClass() && msConfig.setup(testName); if (!b) { - Assume.assumeTrue(false); + initOk = false; return; } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -40,14 +40,15 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu return new MSAccessTestConfiguration("testExecute_([^_]*)_(\\d+)(_.+)*", "%s_%s_V35.mdb", T3InputProviderAvdth35.ID); } + @Ignore @Test public void testExecute_OA_2000() throws Exception { testExecute(AtlanticOceanFixtures.OA_2000); } @Test - public void testExecute_OI_2002() throws Exception { - testExecute(IndianOceanFixtures.OI_2002); + public void testExecute_OI_2000() throws Exception { + testExecute(IndianOceanFixtures.OI_2000); } @Ignore ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java @@ -46,8 +46,8 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp } @Test - public void testExecute_OI_2002() throws Exception { - testExecute(IndianOceanFixtures.OI_2002); + public void testExecute_OI_2000() throws Exception { + testExecute(IndianOceanFixtures.OI_2000); } @Ignore View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3fd9c1e1603d0f7dbb7b4084f5d6f67e2... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3fd9c1e1603d0f7dbb7b4084f5d6f67e2... You're receiving this email because of your account on gitlab.com.