Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 73117 invoked from network); 8 Mar 2010 09:01:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Mar 2010 09:01:04 -0000 Received: (qmail 28958 invoked by uid 500); 8 Mar 2010 09:00:41 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 28812 invoked by uid 500); 8 Mar 2010 09:00:41 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 28801 invoked by uid 99); 8 Mar 2010 09:00:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Mar 2010 09:00:40 +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; Mon, 08 Mar 2010 09:00:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02D2A2388A19; Mon, 8 Mar 2010 09:00:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r920236 - in /commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net: SubnetUtilsTest.java ftp/parser/UnixFTPEntryParserTest.java Date: Mon, 08 Mar 2010 09:00:18 -0000 To: commits@commons.apache.org From: rwinston@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100308090019.02D2A2388A19@eris.apache.org> Author: rwinston Date: Mon Mar 8 09:00:18 2010 New Revision: 920236 URL: http://svn.apache.org/viewvc?rev=920236&view=rev Log: Fix failing test case Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/SubnetUtilsTest.java commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/SubnetUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/SubnetUtilsTest.java?rev=920236&r1=920235&r2=920236&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/SubnetUtilsTest.java (original) +++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/SubnetUtilsTest.java Mon Mar 8 09:00:18 2010 @@ -69,6 +69,10 @@ } } + /** + * Test using the inclusiveHostCount flag, which includes + * the network and broadcast addresses in host counts + */ public void testCidrAddresses() { SubnetUtils utils = new SubnetUtils("192.168.0.1/8"); utils.setInclusiveHostCount(true); @@ -219,7 +223,5 @@ info = utils.getInfo(); assertEquals("255.255.255.255",info.getNetmask()); assertEquals(1, info.getAddressCount()); - - } } Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java?rev=920236&r1=920235&r2=920236&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java (original) +++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Mon Mar 8 09:00:18 2010 @@ -216,7 +216,12 @@ cal.set(Calendar.MINUTE, 7); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); - assertEquals(cal.getTime(), f.getTimestamp().getTime()); + + assertEquals(f.getTimestamp().get(Calendar.MONTH), cal.get(Calendar.MONTH)); + assertEquals(f.getTimestamp().get(Calendar.DAY_OF_MONTH), cal.get(Calendar.DAY_OF_MONTH)); + assertEquals(f.getTimestamp().get(Calendar.HOUR_OF_DAY), cal.get(Calendar.HOUR_OF_DAY)); + assertEquals(f.getTimestamp().get(Calendar.MINUTE), cal.get(Calendar.MINUTE)); + assertEquals(f.getTimestamp().get(Calendar.SECOND), cal.get(Calendar.SECOND)); } public void testFilenamesWithEmbeddedNumbers() {