You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/11/25 10:07:17 UTC
[3/4] git commit: MARMOTTA-376: tests running again
MARMOTTA-376: tests running again
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8c4b0a62
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8c4b0a62
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8c4b0a62
Branch: refs/heads/develop
Commit: 8c4b0a62afcd0637396ad29b5a008b0fed3cf413
Parents: ac556d9
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Nov 25 09:14:36 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Nov 25 09:14:36 2013 +0100
----------------------------------------------------------------------
.../org/apache/marmotta/kiwi/loader/KiWiLoader.java | 11 +++++------
.../org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java | 12 ++++--------
2 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8c4b0a62/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
index e36a7e1..7d61045 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
@@ -246,8 +246,8 @@ public class KiWiLoader {
log.info("Starting import");
for (String inFile: inputFiles) {
final File f = new File(inFile);
- final String extension = "." + fmt.getDefaultFileExtension() + (gzip ? ".gz" : (bzip ? ".bz2" : ""));
- if (f.isDirectory()) {
+ if (f.exists() && f.isDirectory() && fmt != null) {
+ final String extension = "." + fmt.getDefaultFileExtension() + (gzip ? ".gz" : (bzip ? ".bz2" : ""));
File [] files = f.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
@@ -255,10 +255,10 @@ public class KiWiLoader {
}
});
for (File file: files) {
- importFile(file, gzip, bzip, fmt, loader);
+ importFile(file.getName(), file, gzip, bzip, fmt, loader);
}
} else {
- importFile(f, gzip, bzip, fmt, loader);
+ importFile(inFile, f, gzip, bzip, fmt, loader);
}
}
@@ -278,8 +278,7 @@ public class KiWiLoader {
}
}
- private static void importFile(File f, boolean gzip, boolean bzip, RDFFormat fmt, KiWiLoader loader) {
- String fName = f.getName();
+ private static void importFile(String fName, File f, boolean gzip, boolean bzip, RDFFormat fmt, KiWiLoader loader) {
log.info("Importing {}", fName);
try {
InputStream inStream = new FileInputStream(f);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8c4b0a62/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
index 86c31f1..00eb9d1 100644
--- a/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
+++ b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
@@ -28,6 +28,7 @@ import java.util.Properties;
import java.util.zip.GZIPOutputStream;
import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -104,14 +105,10 @@ public class KiWiLoaderTest {
}
@Test
- public void testLoadFile() throws RepositoryException, RDFParseException,
- IOException {
- KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
- "http://example.com/test/", null);
+ public void testLoadFile() throws RepositoryException, RDFParseException, IOException {
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(), "http://example.com/test/", null);
loader.initialize();
-
loader.load(dataFile.getAbsolutePath(), RDFFormat.RDFXML, false);
-
final RepositoryConnection con = loader.getRepository().getConnection();
try {
con.begin();
@@ -127,8 +124,7 @@ public class KiWiLoaderTest {
}
@Test
- public void testLoadFile_GZ() throws RepositoryException, RDFParseException,
- IOException {
+ public void testLoadFile_GZ() throws RepositoryException, RDFParseException, IOException {
File gz = temp.newFile(dataFile.getName() + ".gz");
OutputStream os = new GZIPOutputStream(new FileOutputStream(gz));
FileInputStream is = new FileInputStream(dataFile);