From 34c2f55be748303dc62fa35f958af94566d00295 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Wed, 20 Jul 2016 11:18:35 +0300
Subject: [PATCH] IDEA-153908 The setting "reformat according to style" is not
 saved. (fixing tests)

---
 .../codeInsight/CodeInsightTestCase.java      | 23 +++++++++++++++----
 .../impl/FileTemplateManagerImpl.java         |  8 +------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index e1c97dfa9cfe..a9a66c757d72 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -16,6 +16,9 @@
 package com.intellij.codeInsight;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
+import com.intellij.ide.fileTemplates.FileTemplate;
+import com.intellij.ide.fileTemplates.FileTemplateManager;
+import com.intellij.ide.fileTemplates.impl.FileTemplateManagerImpl;
 import com.intellij.injected.editor.EditorWindow;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.application.ApplicationManager;
@@ -57,10 +60,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Mike
@@ -81,6 +81,21 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
     return editor;
   }
 
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    FileTemplateManager manager = FileTemplateManager.getDefaultInstance();
+    for (String tname : Arrays.asList("Class", "AnnotationType", "Enum", "Interface")) {
+      for (FileTemplate template : manager.getInternalTemplates()) {
+        if (tname.equals(template.getName())) {
+          String text = "package $PACKAGE_NAME$;\npublic " + manager.internalTemplateToSubject(tname) + " $NAME$ { }";
+          template.setText(FileTemplateManagerImpl.normalizeText(text));
+          break;
+        }
+      }
+    }
+  }
+
   @Override
   protected void tearDown() throws Exception {
     try {
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
index b2d37d64c407..0d74f3be97f7 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
@@ -276,7 +276,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
   }
 
   @NotNull
-  private static String normalizeText(@NotNull String text) {
+  public static String normalizeText(@NotNull String text) {
     text = StringUtil.convertLineSeparators(text);
     text = StringUtil.replace(text, "$NAME$", "${NAME}");
     text = StringUtil.replace(text, "$PACKAGE_NAME$", "${PACKAGE_NAME}");
@@ -286,12 +286,6 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
     return text;
   }
 
-  @NonNls
-  @NotNull
-  private String getTestClassTemplateText(@NotNull @NonNls String templateName) {
-    return "package $PACKAGE_NAME$;\npublic " + internalTemplateToSubject(templateName) + " $NAME$ { }";
-  }
-
   @Override
   @NotNull
   public String internalTemplateToSubject(@NotNull @NonNls String templateName) {