From 9794c0f73007b435a9e1cef1efbbf209c74a3f8b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 6 Apr 2012 17:22:24 +0400
Subject: [PATCH] Extracted getting test metadata from comment lines from
 LibrariesWithSourcesTest to JetTestUtils.

---
 .../tests/org/jetbrains/jet/JetTestUtils.java | 25 +++++++++++++++++++
 .../libraries/LibrariesWithSourcesTest.java   | 23 ++---------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index b4a9f37face..126d3e6f199 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.ShutDownTracker;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
@@ -258,4 +259,28 @@ public class JetTestUtils {
         }
         return testFileFiles;
     }
+
+    public static String getLastCommentedLines(@NotNull Document document) {
+        List<CharSequence> resultLines = new ArrayList<CharSequence>();
+        for (int i = document.getLineCount() - 1; i >= 0; i--) {
+            int lineStart = document.getLineStartOffset(i);
+            int lineEnd = document.getLineEndOffset(i);
+            if (document.getCharsSequence().subSequence(lineStart, lineEnd).toString().trim().isEmpty()) {
+                continue;
+            }
+
+            if ("//".equals(document.getCharsSequence().subSequence(lineStart, lineStart + 2).toString())) {
+                resultLines.add(document.getCharsSequence().subSequence(lineStart + 2, lineEnd));
+            } else {
+                break;
+            }
+        }
+        Collections.reverse(resultLines);
+        StringBuilder result = new StringBuilder();
+        for (CharSequence line : resultLines) {
+            result.append(line).append("\n");
+        }
+        result.delete(result.length() - 1, result.length());
+        return result.toString();
+    }
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithSourcesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithSourcesTest.java
index a1659020750..0fa8238db4d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithSourcesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithSourcesTest.java
@@ -29,6 +29,7 @@ import com.intellij.psi.PsiReference;
 import com.intellij.util.containers.MultiMap;
 import jet.Tuple2;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.plugin.references.JetPsiReference;
 
 import java.util.*;
@@ -172,27 +173,7 @@ public class LibrariesWithSourcesTest extends AbstractLibrariesTest {
     private String getExpectedAnnotatedLibraryCode() {
         Document document = FileDocumentManager.getInstance().getDocument(userFile);
         assertNotNull(document);
-        List<CharSequence> resultLines = new ArrayList<CharSequence>();
-        for (int i = document.getLineCount() - 1; i >= 0; i--) {
-            int lineStart = document.getLineStartOffset(i);
-            int lineEnd = document.getLineEndOffset(i);
-            if (document.getCharsSequence().subSequence(lineStart, lineEnd).toString().trim().isEmpty()) {
-                continue;
-            }
-
-            if ("//".equals(document.getCharsSequence().subSequence(lineStart, lineStart + 2).toString())) {
-                resultLines.add(document.getCharsSequence().subSequence(lineStart + 2, lineEnd));
-            } else {
-                break;
-            }
-        }
-        Collections.reverse(resultLines);
-        StringBuilder result = new StringBuilder();
-        for (CharSequence line : resultLines) {
-            result.append(line).append("\n");
-        }
-        result.delete(result.length() - 1, result.length());
-        return result.toString();
+        return JetTestUtils.getLastCommentedLines(document);
     }
 
     @Override