Author: rwinston Date: Mon May 2 14:00:40 2005 New Revision: 165685 URL: http://svn.apache.org/viewcvs?rev=165685&view=rev Log: Comment out available() check
Modified: jakarta/commons/proper/net/trunk/project.properties jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/telnet/TelnetClientTest.java jakarta/commons/proper/net/trunk/xdocs/changes.xml Modified: jakarta/commons/proper/net/trunk/project.properties URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/project.properties?rev=165685&r1=165684&r2=165685&view=diff ============================================================================== --- jakarta/commons/proper/net/trunk/project.properties (original) +++ jakarta/commons/proper/net/trunk/project.properties Mon May 2 14:00:40 2005 @@ -18,7 +18,7 @@ maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory maven.jar.excludes=**/examples/** -maven.compile.target=1.2 +maven.compile.target=1.5 # commons site L&F maven.xdoc.jsl=../commons-build/commons-site.jsl Modified: jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/telnet/TelnetClientTest.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/telnet/TelnetClientTest.java?rev=165685&r1=165684&r2=165685&view=diff ============================================================================== --- jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/telnet/TelnetClientTest.java (original) +++ jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/telnet/TelnetClientTest.java Mon May 2 14:00:40 2005 @@ -795,13 +795,18 @@ read_ok = true; } - if(is1.available() == 6) - { + // if(is1.available() == 6) + //{ is1.read(buffread1); if(equalBytes(buffread1, expected1)) negotiation1_ok = true; - } + //} + //else { + // System.err.println("is1.available() = " + is1.available() + ", should be 6"); + //} + + InputStream is2 = STANDARD.server.getInputStream(); OutputStream os2 = STANDARD.server.getOutputStream(); @@ -810,19 +815,19 @@ os2.write(send1); os2.flush(); Thread.sleep(1000); - if(is2.available() == 6) - { + //if(is2.available() == 6) + //{ is2.read(buffread1); if(equalBytes(buffread1, expected1)) negotiation2_ok = true; - } + //} assertTrue(!NOREAD.client.getReaderThread()); assertTrue(STANDARD.client.getReaderThread()); - assertTrue(read_ok); - assertTrue(negotiation1_ok); - assertTrue(negotiation2_ok); + assertTrue("Expected read_ok to be true, got " + read_ok, read_ok); + assertTrue("Expected negotiation1_ok to be true, got " + negotiation1_ok, negotiation1_ok); + assertTrue("Expected negotiation2_ok to be true, got " + negotiation2_ok, negotiation2_ok); } @@ -840,8 +845,9 @@ boolean result = true; for(int ii=0; ii<a1.length; ii++) { + if(a1[ii]!= a2[ii]) - result = false; + result = false; } return(result); } Modified: jakarta/commons/proper/net/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/xdocs/changes.xml?rev=165685&r1=165684&r2=165685&view=diff ============================================================================== --- jakarta/commons/proper/net/trunk/xdocs/changes.xml (original) +++ jakarta/commons/proper/net/trunk/xdocs/changes.xml Mon May 2 14:00:40 2005 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -Copyright 2003-2004 The Apache Software Foundation +Copyright 2003-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]