1 files changed, 16 insertions, 10 deletions
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java
index 9d26fd804f68..2cbf3fbdfd6c 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java
@@ -17,6 +17,7 @@ package com.intellij.codeInspection.bytecodeAnalysis;
 
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.InferredAnnotationsManager;
+import com.intellij.codeInspection.bytecodeAnalysis.asm.LeakingParameters;
 import com.intellij.codeInspection.bytecodeAnalysis.data.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -37,6 +38,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
+import java.security.MessageDigest;
 import java.util.HashMap;
 
 /**
@@ -47,15 +49,15 @@ public class BytecodeAnalysisTest extends JavaCodeInsightFixtureTestCase {
   private final String myClassesProjectRelativePath = "/classes/" + Test01.class.getPackage().getName().replace('.', '/');
   private JavaPsiFacade myJavaPsiFacade;
   private InferredAnnotationsManager myInferredAnnotationsManager;
-  private BytecodeAnalysisConverter myBytecodeAnalysisConverter;
+  private MessageDigest myMessageDigest;
+
 
   @Override
   protected void setUp() throws Exception {
     super.setUp();
     myJavaPsiFacade = JavaPsiFacade.getInstance(myModule.getProject());
     myInferredAnnotationsManager = InferredAnnotationsManager.getInstance(myModule.getProject());
-    myBytecodeAnalysisConverter = BytecodeAnalysisConverter.getInstance();
-
+    myMessageDigest = MessageDigest.getInstance("MD5");
     setUpDataClasses();
   }
 
@@ -93,7 +95,7 @@ public class BytecodeAnalysisTest extends JavaCodeInsightFixtureTestCase {
           public void visitEnd() {
             super.visitEnd();
             try {
-              map.put(method, cfg.leakingParameters(classReader.getClassName(), node));
+              map.put(method, LeakingParameters.build(classReader.getClassName(), node, false).parameters);
             }
             catch (AnalyzerException ignore) {}
           }
@@ -183,17 +185,21 @@ public class BytecodeAnalysisTest extends JavaCodeInsightFixtureTestCase {
 
   private void checkCompoundId(Method method, PsiMethod psiMethod, boolean noKey) throws IOException {
     Direction direction = new Out();
-    long psiKey = myBytecodeAnalysisConverter.mkPsiKey(psiMethod, direction);
+    System.out.println();
+    System.out.println(method.internalClassName);
+    System.out.println(method.methodName);
+    System.out.println(method.methodDesc);
+
+
+    HKey psiKey = BytecodeAnalysisConverter.psiKey(psiMethod, direction, myMessageDigest);
     if (noKey) {
-      assertTrue(-1 == psiKey);
+      assertTrue(null == psiKey);
       return;
     }
     else {
-      assertFalse(-1 == psiKey);
+      assertFalse(null == psiKey);
     }
-
-    long asmKey = myBytecodeAnalysisConverter.mkAsmKey(new Key(method, direction, true));
-
+    HKey asmKey = BytecodeAnalysisConverter.asmKey(new Key(method, direction, true), myMessageDigest);
     Assert.assertEquals(asmKey, psiKey);
   }