Author: magicaltrout
Date: Thu Jan 1 22:15:28 2015
New Revision: 1648958
URL: http://svn.apache.org/r1648958
Log:
Fix broken tests
Removed:
oodt/trunk/profile/src/test/resources/lightweightTest.xml
Modified:
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
Modified:
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java?rev=1648958&r1=1648957&r2=1648958&view=diff
==============================================================================
--- oodt/trunk/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
(original)
+++ oodt/trunk/profile/src/test/java/org/apache/oodt/profile/ProfileTest.java
Thu Jan 1 22:15:28 2015
@@ -18,19 +18,14 @@
package org.apache.oodt.profile;
+import org.apache.oodt.commons.util.XML;
+import org.w3c.dom.Document;
+
import java.io.BufferedReader;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
import java.util.Map;
-import org.apache.oodt.commons.util.XML;
+
import junit.framework.TestCase;
-import org.w3c.dom.Document;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
-import java.io.FileWriter;
-import java.io.IOException;
/**
* Unit test the Profile class.
@@ -130,6 +125,6 @@ public class ProfileTest extends TestCas
private String oldProfNS;
/** Another (static) test profile, for use by other test cases. */
- static Profile TEST_PROFILE = new
Profile(ProfileAttributesTest.TEST_PROFILE_ATTRIBUTES,
- ResourceAttributesTest.TEST_RESOURCE_ATTRIBUTES);
+ static Profile TEST_PROFILE = new
Profile(org.apache.oodt.profile.ProfileAttributesTest.TEST_PROFILE_ATTRIBUTES,
+
org.apache.oodt.profile.ResourceAttributesTest.TEST_RESOURCE_ATTRIBUTES);
}
Modified:
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java?rev=1648958&r1=1648957&r2=1648958&view=diff
==============================================================================
---
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
(original)
+++
oodt/trunk/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
Thu Jan 1 22:15:28 2015
@@ -18,22 +18,16 @@
package org.apache.oodt.profile.handlers.lightweight;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.oodt.commons.util.SAXParser;
-import org.apache.oodt.commons.util.XML;
import org.apache.oodt.profile.ProfileElement;
import org.apache.oodt.profile.ProfileException;
import org.apache.oodt.xmlquery.XMLQuery;
+
+import java.net.URL;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import junit.framework.TestCase;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* Unit test the LightweightProfileServer class.
@@ -47,7 +41,8 @@ public class LightweightProfileServerTes
}
protected void setUp() throws Exception {
- server = new
LightweightProfileServer(getClass().getResource("lightweightTest.xml"),
"testing");
+ URL url = getClass().getResource("lightweightTest.xml");
+ server = new LightweightProfileServer(url, "testing");
}
/**
