From b639873dae5351fdb78a2ef0225eb31af4c37e4f Mon Sep 17 00:00:00 2001 From: gojomo Date: Tue, 27 Apr 2010 00:44:36 +0000 Subject: [PATCH] Fix broken test * Engine.java tolerate (with return-false-forfailure rather than NPE) non-job directories * EngineTest.java use empty temp job directory rather than (possibly full-of-junk) general junit-tests directory --- .../java/org/archive/crawler/framework/Engine.java | 2 +- .../org/archive/crawler/framework/EngineTest.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/org/archive/crawler/framework/Engine.java b/engine/src/main/java/org/archive/crawler/framework/Engine.java index 353280b6..6068d1c7 100644 --- a/engine/src/main/java/org/archive/crawler/framework/Engine.java +++ b/engine/src/main/java/org/archive/crawler/framework/Engine.java @@ -131,7 +131,7 @@ public class Engine { public boolean accept(File dir, String name) { return name.endsWith(".cxml"); }}); - if(candidateConfigs.length == 0) { + if(candidateConfigs==null || candidateConfigs.length == 0) { // no CXML file found! return false; } diff --git a/engine/src/test/java/org/archive/crawler/framework/EngineTest.java b/engine/src/test/java/org/archive/crawler/framework/EngineTest.java index a235a10b..5e39f876 100644 --- a/engine/src/test/java/org/archive/crawler/framework/EngineTest.java +++ b/engine/src/test/java/org/archive/crawler/framework/EngineTest.java @@ -1,11 +1,18 @@ package org.archive.crawler.framework; +import java.io.File; +import java.io.IOException; + +import org.apache.commons.io.FileUtils; import org.archive.util.TmpDirTestCase; public class EngineTest extends TmpDirTestCase { - public void testGetProfileCxmlResource() { - assertNotNull(new Engine(getTmpDir()).getProfileCxmlResource()); + public void testGetProfileCxmlResource() throws IOException { + File dummyJobsDir = new File(getTmpDir(),"dummyJobsDir"); + assertTrue(dummyJobsDir.mkdirs()); + assertNotNull(new Engine(dummyJobsDir).getProfileCxmlResource()); + FileUtils.deleteDirectory(dummyJobsDir); } }