svn commit: r678174 - in /maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src: main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java

[mrdon]

Author: mrdon
Date: Sat Jul 19 08:26:02 2008
New Revision: 678174

URL: http://svn.apache.org/viewvc?rev=678174&view=rev
Log:
Fixing download files not being cleared properly

Modified:
    
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
    
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java

Modified: 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=678174&r1=678173&r2=678174&view=diff
==============================================================================
--- 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
 (original)
+++ 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
 Sat Jul 19 08:26:02 2008
@@ -99,7 +99,7 @@
     public synchronized void transferCompleted( TransferEvent transferEvent )
     {
         super.transferCompleted(transferEvent);
-        downloads.remove(transferEvent.getResource());
+        downloads.remove(new ResourceWrapper(transferEvent.getResource()));
     }
 
     /**

Modified: 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java?rev=678174&r1=678173&r2=678174&view=diff
==============================================================================
--- 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
 (original)
+++ 
maven/sandbox/branches/maven/maven-2.0.9-db/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
 Sat Jul 19 08:26:02 2008
@@ -70,6 +70,22 @@
         assertEquals("3/9K 4/9K\r", new String(bout.toByteArray()));
     }
 
+    public void testTransferProgressTwoFilesFirstRemoved()
+        throws Exception
+    {
+        byte[] buffer = new byte[2048];
+        monitor.transferProgress( new TransferEventMock(new Resource("foo"), 
10000), buffer, 1024 );
+        assertEquals("1/9K\r", new String(bout.toByteArray()));
+        bout.reset();
+        monitor.transferProgress( new TransferEventMock(new Resource("bar"), 
10000), buffer, 2048 );
+        assertEquals("1/9K 2/9K\r", new String(bout.toByteArray()));
+        bout.reset();
+        monitor.transferCompleted( new TransferEventMock(new Resource("foo"), 
10000));
+        bout.reset();
+        monitor.transferProgress( new TransferEventMock(new Resource("bar"), 
10000), buffer, 2048 );
+        assertEquals("4/9K\r", new String(bout.toByteArray()));
+    }
+
     public void testGetDownloadStatusForResource() 
     {
         ConsoleDownloadMonitor cm = (ConsoleDownloadMonitor)monitor;