From 1b7f712e8e511d28240a111cbe1a65ece17000fd Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 18 Oct 2016 09:24:49 +0300
Subject: [PATCH] temporary fix of tests

---
 .../jps/backwardRefs/BackwardReferenceIndexBuilder.java    | 1 +
 .../jps/backwardRefs/BackwardReferenceIndexWriter.java     | 7 ++++++-
 .../org/jetbrains/references/ReferenceIndexTestBase.kt     | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java
index faa1822a5a74..931177aca9b2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexBuilder.java
@@ -46,6 +46,7 @@ public class BackwardReferenceIndexBuilder extends ModuleLevelBuilder {
     if (writer != null) {
       writer.close();
     }
+    BackwardReferenceIndexWriter.clearInstance();
   }
 
   @Override
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
index 51fa3972d9e5..ecbe4360daab 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
@@ -44,6 +44,7 @@ import static com.sun.tools.javac.code.Flags.PRIVATE;
 
 public class BackwardReferenceIndexWriter {
   public static final String PROP_KEY = "ref.index.builder";
+  public static volatile boolean forceEnabled;
 
   private static volatile BackwardReferenceIndexWriter ourInstance;
 
@@ -55,6 +56,10 @@ public class BackwardReferenceIndexWriter {
     myRebuild = rebuild;
   }
 
+  public static void clearInstance() {
+    ourInstance = null;
+  }
+
   static BackwardReferenceIndexWriter getInstance() {
     return ourInstance;
   }
@@ -83,7 +88,7 @@ public class BackwardReferenceIndexWriter {
   }
 
   static boolean isEnabled() {
-    return SystemProperties.getBooleanProperty(PROP_KEY, false);
+    return SystemProperties.getBooleanProperty(PROP_KEY, false) || forceEnabled;
   }
 
   void close() {
diff --git a/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt b/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
index accc05100e94..faec56b82c8f 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
+++ b/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
@@ -31,11 +31,13 @@ import java.io.File
 
 abstract class ReferenceIndexTestBase : JpsBuildTestCase() {
   public override fun setUp() {
+    BackwardReferenceIndexWriter.forceEnabled = true
     super.setUp()
-    System.setProperty(BackwardReferenceIndexWriter.PROP_KEY, true.toString())
+//    System.setProperty(BackwardReferenceIndexWriter.PROP_KEY, true.toString())
   }
 
   public override fun tearDown() {
+    BackwardReferenceIndexWriter.forceEnabled = false
     super.tearDown()
     System.clearProperty(BackwardReferenceIndexWriter.PROP_KEY)
   }