Fixed tests for updated API.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11515 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -181,6 +181,7 @@
         <path refid="compile.dependencies"/>
         <fileset dir="${jar.dest.dir}" includes="openfire.jar"/>
         <fileset dir="${lib.build.dir}" includes="junit.jar"/>
+        <fileset dir="${lib.dist.dir}" includes="slf4j-log4j12.jar"/>
         <!-- <fileset dir="${ant.home}/lib" includes="clover.jar" /> -->
     </path>
 
@@ -610,11 +611,14 @@
 
         <!-- Run jUnit -->
         <mkdir dir="${test.results.dest.dir}"/>
+        <echo message="openfireHome=${target.openfireHome}"/>
         <junit printsummary="yes" haltonfailure="yes" fork="yes" dir="${test.dest.dir}">
+	    <sysproperty key="openfireHome" value="${target.openfireHome}"/>
 
             <!-- We must add our own classes to the classpath for testing -->
             <classpath>
                 <path refid="test.dependencies"/>
+                <pathelement path="${test.dest.dir}/resources"/>
                 <pathelement path="${test.classes.dest.dir}"/>
             </classpath>
 

src/test/java/org/jivesoftware/util/AdminConsoleTest.java

@@ -28,7 +28,7 @@ public class AdminConsoleTest extends TestCase {
      */
     public void tearDown() throws Exception {
         Class c = AdminConsole.class;
-        Method init = c.getDeclaredMethod("init", (Class[])null);
+        Method init = c.getDeclaredMethod("load", (Class[])null);
         init.setAccessible(true);
         init.invoke((Object)null, (Object[])null);
     }

src/test/java/org/jivesoftware/util/STUNServerTest.java

@@ -31,7 +31,7 @@ public class STUNServerTest extends TestCase {
 
         StunServerAddress addr0 = new StunServerAddress("apollo", "10000");
         StunServerAddress addr1 = new StunServerAddress("apollo", "10000");
-        StunServerAddress addr2 = new StunServerAddress("63.246.20.124", "10002");
+        StunServerAddress addr2 = new StunServerAddress("70.98.39.225", "10002");
         StunServerAddress addr3 = new StunServerAddress("jivesoftware.com", "10002");
         StunServerAddress addr4 = new StunServerAddress("jivesoftware.com", "10003");
 

src/test/resources/log4j.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<appender name="stdout" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy.MM.dd HH:mm:ss} %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<level value="info" />
+		<appender-ref ref="stdout" />
+	</root>
+</log4j:configuration>