Author: dkulp Date: Tue Sep 4 16:17:31 2012 New Revision: 1380731 URL: http://svn.apache.org/viewvc?rev=1380731&view=rev Log: Merged revisions 1380717 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1380717 | dkulp | 2012-09-04 12:07:12 -0400 (Tue, 04 Sep 2012) | 10 lines Merged revisions 1379601 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1379601 | dkulp | 2012-08-31 16:44:36 -0400 (Fri, 31 Aug 2012) | 2 lines Rename a test to make it match what it really is. ........ ........ Modified: cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java Modified: cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java?rev=1380731&r1=1380730&r2=1380731&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java Tue Sep 4 16:17:31 2012 @@ -123,7 +123,7 @@ public class JettyDigestAuthTest extends } @Test - public void testBasicAuth() throws Exception { + public void testDigestAuth() throws Exception { assertEquals("Hello Alice", greeter.greetMe("Alice")); assertEquals("Hello Bob", greeter.greetMe("Bob"));
