Changeset 6798

Timestamp:

11/12/15 09:22:13 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

reverted to original from trunk since we dont have to change paths for contolled vocabularies

File:

• vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) (6 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.importer;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 
 import eu.clarin.cmdi.vlo.LanguageCodeUtils;
@@ -24 +5 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.config.VloConfigFactory;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 public abstract class ImporterTestcase {
@@ -29 +18 @@
     private final VloConfigFactory configFactory = new DefaultVloConfigFactory();
     protected VloConfig config;
-    
-    private static int cnt = 0;
 
     @Rule
@@ -36 +23 @@
 
     protected File createCmdiFile(String name, String content) throws IOException {
-        File file = tempFolder.newFile(name + cnt++ + ".cmdi");
+        File file = tempFolder.newFile(name + System.currentTimeMillis() + ".cmdi");
         FileUtils.writeStringToFile(file, content, "UTF-8");
         return file;
@@ -52 +39 @@
 
         // optionally, modify the configuration here
-
         MetadataImporter.config.setComponentRegistryRESTURL("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/");
-        //point to transformed maps
-        MetadataImporter.config.setLicenseAvailabilityMapUrl(MetadataImporter.config.getLicenseAvailabilityMapUrl());
-        MetadataImporter.config.setLanguageNameVariantsUrl(MetadataImporter.config.getLanguageNameVariantsUrl());
-        MetadataImporter. config.setNationalProjectMapping(MetadataImporter.config.getNationalProjectMapping());
-        MetadataImporter.config.setOrganisationNamesUrl(MetadataImporter.config.getOrganisationNamesUrl());
-        MetadataImporter.config.setResourceClassMapUrl(MetadataImporter.config.getResourceClassMapUrl());
-        
         config = MetadataImporter.config;
 
         MetadataImporter.languageCodeUtils = new LanguageCodeUtils(config);
-        
-      
     }
 
@@ -75 +52 @@
         }
     }
-    
-    
-    
+
 }