Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 45379 invoked from network); 24 Aug 2010 14:30:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Aug 2010 14:30:35 -0000 Received: (qmail 92609 invoked by uid 500); 24 Aug 2010 14:30:35 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 91972 invoked by uid 500); 24 Aug 2010 14:30:32 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 91954 invoked by uid 99); 24 Aug 2010 14:30:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Aug 2010 14:30:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Aug 2010 14:30:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0A0423888FD; Tue, 24 Aug 2010 14:29:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r988562 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ test/ test/src/share/org/apache/catalina/cluster/session/ test/src/share/org/apache/catalina/cluster/tcp/ Date: Tue, 24 Aug 2010 14:29:12 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100824142912.F0A0423888FD@eris.apache.org> Author: rjung Date: Tue Aug 24 14:29:12 2010 New Revision: 988562 URL: http://svn.apache.org/viewvc?rev=988562&view=rev Log: Fix broken unit tests. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/test/build.xml tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988562&r1=988561&r2=988562&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 14:29:12 2010 @@ -32,6 +32,9 @@
+ Fix broken unit tests. (rjung) + + Add Null check when CHANGE_SESSION_ID message received. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=988562&r1=988561&r2=988562&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Tue Aug 24 14:29:12 2010 @@ -39,6 +39,7 @@ + Modified: tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java?rev=988562&r1=988561&r2=988562&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java Tue Aug 24 14:29:12 2010 @@ -39,6 +39,7 @@ public class DeltaManagerTest extends Te public void testCreateSession() { MockDeltaManager manager = new MockDeltaManager() ; + manager.setContainer(new StandardContext()); Session session = manager.createSession(null,false); assertNotNull(session.getId()); assertEquals(32, session.getId().length()); Modified: tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java?rev=988562&r1=988561&r2=988562&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java Tue Aug 24 14:29:12 2010 @@ -20,6 +20,7 @@ package org.apache.catalina.cluster.sess import junit.framework.TestCase; import org.apache.catalina.Manager; +import org.apache.catalina.core.StandardContext; /** * @author Peter Rossbach @@ -30,6 +31,7 @@ public class DeltaSessionTest extends Te public void testPrimarySessionisValid() { DeltaManager manager = new DeltaManager() { public DeltaSession getNewDeltaSession() { return new MockSession(this) ; } } ; + manager.setContainer(new StandardContext()); manager.setMaxInactiveInterval(1); MockSession session = (MockSession)manager.createSession("hello",false); assertTrue(session.isPrimarySession()); @@ -50,6 +52,7 @@ public class DeltaSessionTest extends Te public void testBackupSessionisValid() { DeltaManager manager = new DeltaManager() { public DeltaSession getNewDeltaSession() { return new MockSession(this) ; } } ; + manager.setContainer(new StandardContext()); manager.setMaxInactiveInterval(1); MockSession session = (MockSession)manager.createSession("hello",false); session.setPrimarySession(false); Modified: tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java?rev=988562&r1=988561&r2=988562&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java Tue Aug 24 14:29:12 2010 @@ -68,9 +68,10 @@ public class ReplicationTransmitterTest length = gin.read(tmp); } gin.close(); + ClassLoader[] cls = new ClassLoader[1]; + cls[0] = getClass().getClassLoader(); ReplicationStream stream = new ReplicationStream( - new java.io.ByteArrayInputStream(result), getClass() - .getClassLoader()); + new java.io.ByteArrayInputStream(result), cls); Object myobj = stream.readObject(); return myobj; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org