Changeset 5098

Timestamp:

04/30/14 08:03:06 (10 years ago)

Author:

Twan Goosen

Message:

fixed NPE for vlo config in importer unit tests

Location:

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer

Files:

• CMDIParserVTDXMLTest.java (modified) (1 diff)
• CountryNamePostProcessorTest.java (modified) (2 diffs)
• ImporterTestcase.java (modified) (1 diff)
• LanguageCodePostProcessorTest.java (modified) (1 diff)

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXMLTest.java

@@ -3 +3 @@
 import com.ximpleware.VTDGen;
 import com.ximpleware.VTDNav;
-import eu.clarin.cmdi.vlo.config.DefaultVloConfigFactory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import org.junit.Before;
 import org.junit.Test;
 
-public class CMDIParserVTDXMLTest {
-    
-    @Before
-    public void setUp() throws Exception {
-        // read the configuration from the default configuration file
-        new DefaultVloConfigFactory().newConfig();
-    }
+public class CMDIParserVTDXMLTest extends ImporterTestcase {
 
     @Test

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CountryNamePostProcessorTest.java

@@ -6 +6 @@
 import org.junit.Test;
 
-public class CountryNamePostProcessorTest {
+public class CountryNamePostProcessorTest extends ImporterTestcase {
 
     @Before
     public void setUp() throws Exception {
-        
+
         // read the configuration from the packaged configuration file
         new DefaultVloConfigFactory().newConfig();
@@ -16 +16 @@
         // optionally, modify the configuration here
     }
-    
+
     @Test
     public void testCountryCode() {

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

@@ -25 +25 @@
     public void cleanup() {
         FileUtils.deleteQuietly(testDir);
+        MetadataImporter.config = null;
     }
 

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessorTest.java

@@ -6 +6 @@
 import org.junit.Test;
 
-public class LanguageCodePostProcessorTest {
+public class LanguageCodePostProcessorTest extends ImporterTestcase {
 
     @Before