You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/07 13:47:42 UTC
oodt git commit: OODT-882 Fix failing PGE test and upgrade it to
Junit 4
Repository: oodt
Updated Branches:
refs/heads/master 2726c0860 -> eceb9261e
OODT-882 Fix failing PGE test and upgrade it to Junit 4
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/eceb9261
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/eceb9261
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/eceb9261
Branch: refs/heads/master
Commit: eceb9261eb556a3f2e6c763243a1090881366b05
Parents: 2726c08
Author: Tom Barber <to...@analytical-labs.com>
Authored: Wed Oct 7 12:43:52 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Wed Oct 7 12:43:52 2015 +0100
----------------------------------------------------------------------
.../oodt/cas/pge/TestPGETaskInstance.java | 107 +++++++++----------
1 file changed, 50 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/eceb9261/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
index c2eea3f..812f526 100644
--- a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
@@ -17,58 +17,12 @@
package org.apache.oodt.cas.pge;
//OODT static imports
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.ACTION_IDS;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.ATTEMPT_INGEST_ALL;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.CONFIG_FILE_PATH;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.CRAWLER_CONFIG_FILE;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.CRAWLER_CRAWL_FOR_DIRS;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.CRAWLER_RECUR;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.DUMP_METADATA;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.INGEST_CLIENT_TRANSFER_SERVICE_FACTORY;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.INGEST_FILE_MANAGER_URL;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.MIME_EXTRACTOR_REPO;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.NAME;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.PGE_CONFIG_BUILDER;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.PROPERTY_ADDERS;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.REQUIRED_METADATA;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.WORKFLOW_MANAGER_URL;
-import static org.apache.oodt.cas.pge.metadata.PgeTaskStatus.CRAWLING;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-//JDK imports
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-import java.net.URL;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-
-//JUnit imports
-import junit.framework.TestCase;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
-//Apache imports
import org.apache.commons.io.FileUtils;
-
-//OODT imports
import org.apache.oodt.cas.crawl.AutoDetectProductCrawler;
import org.apache.oodt.cas.crawl.ProductCrawler;
import org.apache.oodt.cas.crawl.action.CrawlerAction;
@@ -86,11 +40,35 @@ import org.apache.oodt.cas.pge.writers.MockDynamicConfigFileWriter;
import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
+import org.junit.After;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.StringReader;
+import java.util.*;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.*;
+import static org.apache.oodt.cas.pge.metadata.PgeTaskStatus.CRAWLING;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+//JDK imports
+//JUnit imports
+//Apache imports
+//OODT imports
//Google imports
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
/**
@@ -98,11 +76,11 @@ import com.google.common.collect.Sets;
*
* @author bfoster (Brian Foster)
*/
-public class TestPGETaskInstance extends TestCase {
+public class TestPGETaskInstance {
private final List<File> tmpDirs = Lists.newArrayList();
- @Override
+ @After
public void tearDown() throws Exception {
for (File tmpDir : tmpDirs) {
FileUtils.forceDelete(tmpDir);
@@ -110,6 +88,7 @@ public class TestPGETaskInstance extends TestCase {
tmpDirs.clear();
}
+ @Test
public void testLoadPropertyAdders() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
ConfigFilePropertyAdder propAdder = pgeTask
@@ -119,6 +98,7 @@ public class TestPGETaskInstance extends TestCase {
assertTrue(propAdder instanceof MockConfigFilePropertyAdder);
}
+ @Test
public void testRunPropertyAdders() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
pgeTask.pgeMetadata.replaceMetadata(PROPERTY_ADDERS,
@@ -152,6 +132,7 @@ public class TestPGETaskInstance extends TestCase {
System.getProperties().remove(PgeTaskMetKeys.USE_LEGACY_PROPERTY);
}
+ @Test
public void testCreatePgeMetadata() throws Exception {
final String PGE_NAME = "PGE_Test";
final String PGE_REQUIRED_METADATA = "Filename, FileLocation ";
@@ -189,6 +170,7 @@ public class TestPGETaskInstance extends TestCase {
.getAllMetadata(PROPERTY_ADDERS).get(0));
}
+ @Test
@SuppressWarnings("unchecked") // FileUtils.readLines cast to List<String>
public void testLogger() throws Exception {
PGETaskInstance pgeTask1 = createTestInstance();
@@ -229,6 +211,7 @@ public class TestPGETaskInstance extends TestCase {
assertEquals(Level.SEVERE.getLocalizedName() + ": pge2 message1", messages.get(1));
}
+ @Test
public void testUpdateStatus() throws Exception {
final Map<String, String> args = Maps.newHashMap();
PGETaskInstance pgeTask = createTestInstance();
@@ -249,6 +232,7 @@ public class TestPGETaskInstance extends TestCase {
assertEquals(status, args.get("Status"));
}
+ @Test
public void testCreatePgeConfig() throws Exception {
final String KEY = "TestKey";
final String VALUE = "TestValue";
@@ -276,6 +260,7 @@ public class TestPGETaskInstance extends TestCase {
assertEquals(MockPgeConfigBuilder.MOCK_EXE_DIR, pgeConfig.getExeDir());
}
+ @Test
public void testCreateWorkflowManagerClient() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
pgeTask.pgeMetadata.replaceMetadata(WORKFLOW_MANAGER_URL,
@@ -285,6 +270,7 @@ public class TestPGETaskInstance extends TestCase {
assertNotNull(wmClient);
}
+ @Test
public void testGetWorkflowInstanceId() throws Exception {
String workflowInstId = "12345";
PGETaskInstance pgeTask = createTestInstance();
@@ -293,6 +279,7 @@ public class TestPGETaskInstance extends TestCase {
assertEquals(workflowInstId, pgeTask.getWorkflowInstanceId());
}
+ @Test
public void testCreateExeDir() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
File exeDir = new File(pgeTask.pgeConfig.getExeDir());
@@ -302,6 +289,7 @@ public class TestPGETaskInstance extends TestCase {
assertTrue(exeDir.exists());
}
+ @Test
public void testCreateOuputDirsIfRequested() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
File outputDir1 = createTmpDir();
@@ -324,6 +312,7 @@ public class TestPGETaskInstance extends TestCase {
assertFalse(outputDir3.exists());
}
+ @Test
public void testCreateDynamicConfigFile() throws Exception {
File tmpDir = createTmpDir();
FileUtils.forceDelete(tmpDir);
@@ -351,7 +340,8 @@ public class TestPGETaskInstance extends TestCase {
InputSource is = new InputSource(new StringReader(xml));
return builder.parse(is);
}
-
+
+ @Test
public void testDumpMetadataIfRequested() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
File dumpMetFile = new File(pgeTask.getDumpMetadataPath());
@@ -364,13 +354,13 @@ public class TestPGETaskInstance extends TestCase {
String expectedMetString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<cas:metadata xmlns:cas=\"http://oodt.jpl.nasa.gov/1.0/cas\">"
+ "<keyval type=\"vector\">"
- + "<key>PGETask%2FName</key>"
+ + "<key>PGETask_Name</key>"
+ "<val>"
+ pgeTask.pgeMetadata.getMetadata(NAME)
+ "</val>"
+ "</keyval>"
+ "<keyval type=\"vector\">"
- + "<key>PGETask%2FDumpMetadata</key>"
+ + "<key>PGETask_DumpMetadata</key>"
+ "<val>"
+ pgeTask.pgeMetadata.getMetadata(DUMP_METADATA)
+ "</val>"
@@ -416,6 +406,7 @@ public class TestPGETaskInstance extends TestCase {
}
+ @Test
public void testCreateProductCrawler() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
pgeTask.pgeMetadata.replaceMetadata(MIME_EXTRACTOR_REPO,
@@ -457,6 +448,7 @@ public class TestPGETaskInstance extends TestCase {
assertFalse(pc.isNoRecur());
}
+ @Test
public void testRunIngestCrawler() throws Exception {
// Case: UpdateStatus Success, VerifyIngest Success,
PGETaskInstance pgeTask = createTestInstance();
@@ -534,6 +526,7 @@ public class TestPGETaskInstance extends TestCase {
verify(pc);
}
+ @Test
public void testVerifyIngests() throws Exception {
PGETaskInstance pgeTask = createTestInstance();