# HG changeset patch # User Raimund Renkert # Date 1377068308 -7200 # Node ID 79cbc672d8e4cca869aa508cb86875a111c11e09 # Parent 9b4d417f10646a492e24ea59c0f7dff574afd2b7 Updates systemproperty keys and testcases. diff -r 9b4d417f1064 -r 79cbc672d8e4 src/test/java/de/intevation/lada/importer/TestLAFImporter.java --- a/src/test/java/de/intevation/lada/importer/TestLAFImporter.java Wed Aug 21 08:57:57 2013 +0200 +++ b/src/test/java/de/intevation/lada/importer/TestLAFImporter.java Wed Aug 21 08:58:28 2013 +0200 @@ -33,9 +33,9 @@ @Before @Ignore public void loadLafFiles() { - String single = System.getProperty("de_intevation_lada_test_singleprobe"); + String single = System.getProperty("de.intevation.lada.test.singleprobe"); String incomplete = - System.getProperty("de_intevation_lada_test_incompleteprobe"); + System.getProperty("de.intevation.lada.test.incompleteprobe"); try { byte[] encodedSingle = Files.readAllBytes(Paths.get(single)); byte[] encodedIncomplete = @@ -52,17 +52,16 @@ } } - @Test(expected = IOException.class) - @Ignore + @Test public void testConfigFileNotFound() { LAFFormat format = new LAFFormat(); boolean success = format.readConfigFile("/file/not/found"); + assertEquals(false, success); } @Test - @Ignore public void testConfigFileLoading() { - String fileName = System.getProperty("de_intevation_lada_import"); + String fileName = System.getProperty("de.intevation.lada.import"); LAFFormat format = new LAFFormat(); boolean success = format.readConfigFile(fileName); assertEquals(true, success); @@ -86,13 +85,13 @@ ortFormat.size()); } - @Test(expected = LAFParserException.class) - @Ignore + @Test public void testProbeHeaderFail() { LAFParser parser = new LAFParser(); parser.setDryRun(true); try { - parser.parse(PROBE_HEADER_FAIL); + boolean success = parser.parse(PROBE_HEADER_FAIL); + assertEquals(false, success); } catch (LAFParserException e) { assertEquals( @@ -115,10 +114,9 @@ } @Test - @Ignore public void testCompleteParser() { LAFParser parser = new LAFParser(); - //parser.setDryRun(true); + parser.setDryRun(true); try { parser.parse(singleProbe); } @@ -126,16 +124,4 @@ e.printStackTrace(); } } - - @Test - @Ignore - public void testMessungParser() { - fail("Not yet implemented"); - } - - @Test - @Ignore - public void testOrtParser() { - fail("Not yet implemented"); - } }