Author: mattmann
Date: Fri Apr 17 17:33:40 2015
New Revision: 1674361
URL: http://svn.apache.org/r1674361
Log:
Fix for OODT-831 CAS PGE adapter framework build failed by Aditya Dhulipala
<[email protected]> this closes #16.
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1674361&r1=1674360&r2=1674361&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Fri Apr 17 17:33:40 2015
@@ -2,6 +2,8 @@ Apache OODT Change Log
======================
Release 0.9 - Current Development
+* OODT-831 CAS PGE adapter framework build failed (Aditya Dhulipala via
mattmann)
+
* OODT-830 Queue Assertion failure of XmlQueueRepository under CAS Resource
Manager (Aditya Dhulipala via mattmann)
* OODT-823 OODT JDK8 Maven3 build errors (Aditya Dhulipala via mattmann)
Modified:
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java?rev=1674361&r1=1674360&r2=1674361&view=diff
==============================================================================
---
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
(original)
+++
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
Fri Apr 17 17:33:40 2015
@@ -42,14 +42,25 @@ import static org.easymock.EasyMock.veri
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;
@@ -81,6 +92,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+
/**
* Test class for {@link PGETaskInstance}.
*
@@ -325,6 +337,21 @@ public class TestPGETaskInstance extends
assertTrue(dynamicConfigFile.exists());
}
+ private static Document parseXmlFile(File file) throws Exception{
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ Document dom = null;
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ dom = db.parse(file);
+ return dom;
+ }
+
+ public static Document parseXmlString(String xml) throws Exception {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ InputSource is = new InputSource(new StringReader(xml));
+ return builder.parse(is);
+ }
+
public void testDumpMetadataIfRequested() throws Exception {
PGETaskInstance pgeTask = createTestInstance();
File dumpMetFile = new File(pgeTask.getDumpMetadataPath());
@@ -334,24 +361,59 @@ public class TestPGETaskInstance extends
pgeTask.dumpMetadataIfRequested();
assertTrue(dumpMetFile.exists());
@SuppressWarnings("unchecked")
- List<String> dumpedMet = FileUtils.readLines(dumpMetFile, "UTF-8");
- assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
- dumpedMet.get(0));
- assertEquals(
- "<cas:metadata xmlns:cas=\"http://oodt.jpl.nasa.gov/1.0/cas\";>",
- dumpedMet.get(1));
- assertEquals(" <keyval type=\"vector\">", dumpedMet.get(2));
- assertEquals(" <key>PGETask%2FName</key>", dumpedMet.get(3));
- assertEquals(" <val>" + pgeTask.pgeMetadata.getMetadata(NAME)
- + "</val>", dumpedMet.get(4));
- assertEquals(" </keyval>", dumpedMet.get(5));
- assertEquals(" <keyval type=\"vector\">", dumpedMet.get(6));
- assertEquals(" <key>PGETask%2FDumpMetadata</key>",
dumpedMet.get(7));
- assertEquals(
- " <val>" + pgeTask.pgeMetadata.getMetadata(DUMP_METADATA)
- + "</val>", dumpedMet.get(8));
- assertEquals(" </keyval>", dumpedMet.get(9));
- assertEquals("</cas:metadata>", dumpedMet.get(10));
+ 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>"
+ + "<val>"
+ + pgeTask.pgeMetadata.getMetadata(NAME)
+ + "</val>"
+ + "</keyval>"
+ + "<keyval type=\"vector\">"
+ + "<key>PGETask%2FDumpMetadata</key>"
+ + "<val>"
+ + pgeTask.pgeMetadata.getMetadata(DUMP_METADATA)
+ + "</val>"
+ + "</keyval>"
+ + "</cas:metadata>";
+
+ Document dumpMetDoc = parseXmlFile(dumpMetFile);
+ Document expectedMetDoc = parseXmlString(expectedMetString);
+
+
+ Element dumpMetRoot, expectedMetRoot;
+ dumpMetRoot = dumpMetDoc.getDocumentElement();
+ expectedMetRoot = expectedMetDoc.getDocumentElement();
+
+
+ NodeList dumpKeyList = dumpMetRoot.getElementsByTagName("key");
+ NodeList expectedKeyList = expectedMetRoot.getElementsByTagName("key");
+
+ NodeList dumpValList = dumpMetRoot.getElementsByTagName("val");
+ NodeList expectedValList = expectedMetRoot.getElementsByTagName("val");
+
+ assertEquals(dumpKeyList.getLength(), expectedKeyList.getLength());
+ assertEquals(dumpValList.getLength(), expectedValList.getLength());
+
+
+ Map<String, String> dumpKeyValMap = new HashMap<String, String>();
+ Map<String, String> expectedKeyValMap = new HashMap<String, String>();
+
+ for (int i = 0; i < dumpKeyList.getLength(); i++) {
+
+ Node k1 = dumpKeyList.item(i);
+ Node k2 = expectedKeyList.item(i);
+
+ Node v1 = dumpValList.item(i);
+ Node v2 = expectedValList.item(i);
+
+ dumpKeyValMap.put(k1.getFirstChild().getNodeValue(),
v1.getFirstChild().getNodeValue());
+ expectedKeyValMap.put(k2.getFirstChild().getNodeValue(),
v2.getFirstChild().getNodeValue());
+
+ }
+
+ assertTrue(dumpKeyValMap.equals(expectedKeyValMap));
+
}
public void testCreateProductCrawler() throws Exception {
