Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
3fd9c1e1
by Tony CHEMIT at 2018-03-06T16:16:31Z
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:
| ... | ... | @@ -42,6 +42,7 @@ import org.junit.Rule; |
| 42 | 42 |
import java.io.BufferedWriter;
|
| 43 | 43 |
import java.io.File;
|
| 44 | 44 |
import java.io.FileOutputStream;
|
| 45 |
+import java.io.IOException;
|
|
| 45 | 46 |
import java.io.OutputStreamWriter;
|
| 46 | 47 |
import java.util.List;
|
| 47 | 48 |
import java.util.Set;
|
| ... | ... | @@ -62,7 +63,7 @@ public abstract class AnalyzeInputSourceActionTestSupport { |
| 62 | 63 |
protected abstract MSAccessTestConfiguration createConfiguration();
|
| 63 | 64 |
|
| 64 | 65 |
@Before
|
| 65 |
- public void setUp() throws Exception {
|
|
| 66 |
+ public void setUp() throws IOException {
|
|
| 66 | 67 |
boolean initOk = serviceContext.isInitOk();
|
| 67 | 68 |
Assume.assumeTrue("Could not init db", initOk);
|
| 68 | 69 |
MSAccessTestConfiguration msConfig = serviceContext.getMsConfig();
|
| ... | ... | @@ -194,7 +194,7 @@ public class FakeT3AvdthServiceContext extends TestWatcher implements T3ServiceC |
| 194 | 194 |
if (msConfig != null) {
|
| 195 | 195 |
boolean b = msConfig.beforeClass() && msConfig.setup(testName);
|
| 196 | 196 |
if (!b) {
|
| 197 |
- Assume.assumeTrue(false);
|
|
| 197 |
+ initOk = false;
|
|
| 198 | 198 |
return;
|
| 199 | 199 |
}
|
| 200 | 200 |
}
|
| ... | ... | @@ -40,14 +40,15 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu |
| 40 | 40 |
return new MSAccessTestConfiguration("testExecute_([^_]*)_(\\d+)(_.+)*", "%s_%s_V35.mdb", T3InputProviderAvdth35.ID);
|
| 41 | 41 |
}
|
| 42 | 42 |
|
| 43 |
+ @Ignore
|
|
| 43 | 44 |
@Test
|
| 44 | 45 |
public void testExecute_OA_2000() throws Exception {
|
| 45 | 46 |
testExecute(AtlanticOceanFixtures.OA_2000);
|
| 46 | 47 |
}
|
| 47 | 48 |
|
| 48 | 49 |
@Test
|
| 49 |
- public void testExecute_OI_2002() throws Exception {
|
|
| 50 |
- testExecute(IndianOceanFixtures.OI_2002);
|
|
| 50 |
+ public void testExecute_OI_2000() throws Exception {
|
|
| 51 |
+ testExecute(IndianOceanFixtures.OI_2000);
|
|
| 51 | 52 |
}
|
| 52 | 53 |
|
| 53 | 54 |
@Ignore
|
| ... | ... | @@ -46,8 +46,8 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp |
| 46 | 46 |
}
|
| 47 | 47 |
|
| 48 | 48 |
@Test
|
| 49 |
- public void testExecute_OI_2002() throws Exception {
|
|
| 50 |
- testExecute(IndianOceanFixtures.OI_2002);
|
|
| 49 |
+ public void testExecute_OI_2000() throws Exception {
|
|
| 50 |
+ testExecute(IndianOceanFixtures.OI_2000);
|
|
| 51 | 51 |
}
|
| 52 | 52 |
|
| 53 | 53 |
@Ignore
|