svn commit: r630861 - in /maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode: BytecodeIndexTest.java BytecodeRecordLoader.java

[brett]

Author: brett
Date: Mon Feb 25 06:25:28 2008
New Revision: 630861

URL: http://svn.apache.org/viewvc?rev=630861&view=rev
Log:
remove cache that caused BytecodeIndexTest to erroneously pass, fix test
Merged from: r630859

Modified:
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
    
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java?rev=630861&r1=630860&r2=630861&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
 Mon Feb 25 06:25:28 2008
@@ -59,6 +59,8 @@
         ArchivaArtifact artifact = (ArchivaArtifact) dumps.get( 
"archiva-common" );
         
         File dumpFile = getDumpFile( artifact );
-        return BytecodeRecordLoader.loadRecord( dumpFile, artifact );
+        BytecodeRecord record = BytecodeRecordLoader.loadRecord( dumpFile, 
artifact );
+        record.setRepositoryId( "test-repo" );
+        return record;
     }
 }

Modified: 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java?rev=630861&r1=630860&r2=630861&view=diff
==============================================================================
--- 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
 (original)
+++ 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
 Mon Feb 25 06:25:28 2008
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import junit.framework.AssertionFailedError;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails;
 import org.apache.maven.archiva.model.platform.JavaArtifactHelper;
@@ -29,10 +30,6 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.AssertionFailedError;
 
 /**
  * BytecodeRecordLoader - Utility method for loading dump files into 
BytecordRecords. 
@@ -42,15 +39,16 @@
  */
 public class BytecodeRecordLoader
 {
-    private static Map cache = new HashMap();
+//    private static Map cache = new HashMap();
 
     public static BytecodeRecord loadRecord( File dumpFile, ArchivaArtifact 
artifact )
     {
-        BytecodeRecord record = (BytecodeRecord) cache.get( artifact );
-        if ( record != null )
-        {
-            return record;
-        }
+        BytecodeRecord record;
+//        record = (BytecodeRecord) cache.get( artifact );
+//        if ( record != null )
+//        {
+//            return record;
+//        }
 
         record = new BytecodeRecord();
         record.setArtifact( artifact );
@@ -131,7 +129,7 @@
             IOUtil.close( freader );
         }
 
-        cache.put( artifact, record );
+//        cache.put( artifact, record );
 
         return record;
     }