svn commit: r1648421 - in /oodt/trunk/commons: pom.xml src/test/java/org/apache/oodt/commons/MultiServerTest.java src/test/java/org/apache/oodt/commons/util/XMLTest.java

[tpalsulich]

Author: tpalsulich
Date: Mon Dec 29 20:38:18 2014
New Revision: 1648421

URL: http://svn.apache.org/r1648421
Log:
Fix test errors in commons from recent OODT-762 changes.

Modified:
    oodt/trunk/commons/pom.xml
    
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/MultiServerTest.java
    oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java

Modified: oodt/trunk/commons/pom.xml
URL: 
http://svn.apache.org/viewvc/oodt/trunk/commons/pom.xml?rev=1648421&r1=1648420&r2=1648421&view=diff
==============================================================================
--- oodt/trunk/commons/pom.xml (original)
+++ oodt/trunk/commons/pom.xml Mon Dec 29 20:38:18 2014
@@ -50,22 +50,6 @@
             </includes>
         </resource>
     </resources>
-    <testResources>
-        <testResource>
-            <targetPath>org/apache/oodt/commons/util</targetPath>
-            <directory>${basedir}/src/testdata</directory>
-            <includes>
-                <include>test.xml</include>
-            </includes>
-        </testResource>
-        <testResource>
-            <targetPath>org/apache/oodt/commons</targetPath>
-            <directory>${basedir}/src/testdata</directory>
-            <includes>
-                <include>test-multiserver.xml</include>
-            </includes>
-        </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -76,7 +60,7 @@
           <systemProperties>
              <property>
                <name>java.util.logging.config.file</name>
-               <value>${basedir}/src/testdata/test.logging.properties</value>
+               
<value>${basedir}/src/test/resources/test.logging.properties</value>
               </property>
            </systemProperties>
            <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
@@ -102,7 +86,7 @@
             <artifactId>rat-maven-plugin</artifactId>
             <configuration>
               <excludes>
-                <exclude>**/testdata/*</exclude>
+                <exclude>**/test/resources/*</exclude>
                 <exclude>**/package.html</exclude>
               </excludes>
               <numUnapprovedLicenses>1</numUnapprovedLicenses>

Modified: 
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/MultiServerTest.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/commons/src/test/java/org/apache/oodt/commons/MultiServerTest.java?rev=1648421&r1=1648420&r2=1648421&view=diff
==============================================================================
--- 
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/MultiServerTest.java 
(original)
+++ 
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/MultiServerTest.java 
Mon Dec 29 20:38:18 2014
@@ -41,7 +41,7 @@ public class MultiServerTest extends Tes
 
        protected void setUp() throws Exception {
                super.setUp();
-               testConfig = 
getClass().getResourceAsStream("test-multiserver.xml");
+               testConfig = 
getClass().getResourceAsStream("/test-multiserver.xml");
                if (testConfig == null) throw new IOException("Cannot find 
`test-multiserver.xml'");
                System.setProperty("my.other.setting", "Don't override");
        }

Modified: 
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java?rev=1648421&r1=1648420&r2=1648421&view=diff
==============================================================================
--- oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java 
(original)
+++ oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java 
Mon Dec 29 20:38:18 2014
@@ -32,7 +32,7 @@ public class XMLTest extends TestCase {
        }
 
        protected void setUp() throws Exception {
-               reader = new BufferedReader(new 
InputStreamReader(getClass().getResourceAsStream("test.xml")));
+               reader = new BufferedReader(new 
InputStreamReader(XMLTest.class.getResourceAsStream("/test.xml")));
                inputSource = new InputSource(reader);
        }