From 800d9fe66cce230e6ef82be7b6f825a7e43a834e Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 22 Jul 2010 11:32:05 +0400
Subject: [PATCH] tests fixed

---
 .../intellij/compiler/impl/StateCache.java    |  4 ++--
 .../intellij/util/io/PersistentHashMap.java   | 24 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java b/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java
index 676d7f2b38f3..bd56b6653b91 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java
@@ -54,7 +54,7 @@ public abstract class StateCache<T> {
     }
     catch (IOException ignored) {
     }
-    myMap.deleteFiles();
+    PersistentHashMap.deleteFilesStartingWith(myBaseFile);
     try {
       myMap = createMap(myBaseFile);
     }
@@ -102,4 +102,4 @@ public abstract class StateCache<T> {
     });
   }
 
-}
\ No newline at end of file
+}
diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 70cd41364c00..ef47ffd844a3 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -119,7 +119,7 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumerator<Key>{
       myValueStorage = PersistentHashMapValueStorage.create(getDataFile(myFile).getPath());
       myGarbageSize = getMetaData();
 
-      if (makesSenceToCompact()) {
+      if (makesSenseToCompact()) {
         compact();
       }
     }
@@ -136,27 +136,23 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumerator<Key>{
     return myFile;
   }
 
-  private boolean makesSenceToCompact() {
-    final long filesize = getDataFile(myFile).length();
-    return filesize > 5 * 1024 * 1024 && myGarbageSize * 2 > filesize; // file is longer than 5MB and more than 50% of data is garbage
+  private boolean makesSenseToCompact() {
+    final long fileSize = getDataFile(myFile).length();
+    return fileSize > 5 * 1024 * 1024 && myGarbageSize * 2 > fileSize; // file is longer than 5MB and more than 50% of data is garbage
   }
 
   private static File checkDataFiles(final File file) {
     if (!file.exists()) {
-      deleteFiles(file);
+      deleteFilesStartingWith(getDataFile(file));
     }
     return file;
   }
 
-  public void deleteFiles() {
-    deleteFiles(myFile);
-  }
-
-  private static void deleteFiles(File baseFile) {
-    final String baseName = baseFile.getName();
-    final File[] files = baseFile.getParentFile().listFiles(new FileFilter() {
-      public boolean accept(final File pathname) {
-        return pathname.getName().startsWith(baseName);
+  public static void deleteFilesStartingWith(File prefixFile) {
+    final String baseName = prefixFile.getName();
+    final File[] files = prefixFile.getParentFile().listFiles(new FileFilter() {
+      public boolean accept(final File pathName) {
+        return pathName.getName().startsWith(baseName);
       }
     });
     if (files != null) {