Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove cache that caused BytecodeIndexTest to erroneously pass, fix test 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@630859 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-02-25 14:22:54 +00:00
parent dcaeec7ff7
commit 056b02a968
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeIndexTest.java
View File

@ -59,6 +59,8 @@ public class BytecodeIndexTest extends AbstractIndexCreationTestCase
ArchivaArtifact artifact = (ArchivaArtifact) dumps.get( "archiva-common" ); ArchivaArtifact artifact = (ArchivaArtifact) dumps.get( "archiva-common" );
File dumpFile = getDumpFile( artifact ); File dumpFile = getDumpFile( artifact );
return BytecodeRecordLoader.loadRecord( dumpFile, artifact ); BytecodeRecord record = BytecodeRecordLoader.loadRecord( dumpFile, artifact );
record.setRepositoryId( "test-repo" );
return record;
} }
} }

20
archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
View File

@ -19,6 +19,7 @@ package org.apache.maven.archiva.indexer.bytecode;
* under the License. * under the License.
*/ */
import junit.framework.AssertionFailedError;
import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails; import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails;
import org.apache.maven.archiva.model.platform.JavaArtifactHelper; import org.apache.maven.archiva.model.platform.JavaArtifactHelper;
@ -29,10 +30,6 @@ import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; 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. * BytecodeRecordLoader - Utility method for loading dump files into BytecordRecords.
@ -42,15 +39,16 @@ import junit.framework.AssertionFailedError;
*/ */
public class BytecodeRecordLoader public class BytecodeRecordLoader
{ {
private static Map cache = new HashMap(); // private static Map cache = new HashMap();
public static BytecodeRecord loadRecord( File dumpFile, ArchivaArtifact artifact ) public static BytecodeRecord loadRecord( File dumpFile, ArchivaArtifact artifact )
{ {
BytecodeRecord record = (BytecodeRecord) cache.get( artifact ); BytecodeRecord record;
if ( record != null ) // record = (BytecodeRecord) cache.get( artifact );
{ // if ( record != null )
return record; // {
} // return record;
// }
record = new BytecodeRecord(); record = new BytecodeRecord();
record.setArtifact( artifact ); record.setArtifact( artifact );
@ -131,7 +129,7 @@ public class BytecodeRecordLoader
IOUtil.close( freader ); IOUtil.close( freader );
} }
cache.put( artifact, record ); // cache.put( artifact, record );
return record; return record;
} }