From d27e523c4d05fb8deb3cc70c629097ed0edea5a4 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 14 Jan 2010 13:05:46 +0300
Subject: [PATCH] cleanup

---
 .../com/jetbrains/python/PythonLexerTest.java | 95 +++++++++----------
 1 file changed, 46 insertions(+), 49 deletions(-)

diff --git a/python/testSrc/com/jetbrains/python/PythonLexerTest.java b/python/testSrc/com/jetbrains/python/PythonLexerTest.java
index 3516d2df9317..588714457070 100644
--- a/python/testSrc/com/jetbrains/python/PythonLexerTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonLexerTest.java
@@ -1,19 +1,3 @@
-/*
- *  Copyright 2005 Pythonid Project
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS"; BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 package com.jetbrains.python;
 
 import com.intellij.lexer.Lexer;
@@ -25,90 +9,103 @@ import junit.framework.TestCase;
  */
 public class PythonLexerTest extends TestCase {
   public void testSimpleExpression() throws Exception {
-    doTest("a=1", new String[]{"Py:IDENTIFIER", "Py:EQ", "Py:INTEGER_LITERAL"});
+    doTest("a=1", "Py:IDENTIFIER", "Py:EQ", "Py:INTEGER_LITERAL");
   }
 
   public void testMergeSpaces() throws Exception {
-    doTest("a  =    1", new String[]{"Py:IDENTIFIER", "Py:SPACE", "Py:EQ", "Py:SPACE", "Py:INTEGER_LITERAL"});
+    doTest("a  =    1", "Py:IDENTIFIER", "Py:SPACE", "Py:EQ", "Py:SPACE", "Py:INTEGER_LITERAL");
   }
 
   public void testLineBreakInBraces() throws Exception {
-    doTest("[a,\n b]", new String[]{"Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET"});
+    doTest("[a,\n b]", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET");
   }
 
   public void testLineBreakInBraces2() throws Exception {
-    doTest("x=[a,\n b]", new String[]{"Py:IDENTIFIER", "Py:EQ", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK",
-      "Py:IDENTIFIER", "Py:RBRACKET"});
+    doTest("x=[a,\n b]", "Py:IDENTIFIER", "Py:EQ", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK",
+           "Py:IDENTIFIER", "Py:RBRACKET");
   }
 
   public void testLineBreakInBracesAfterComment() throws Exception {
-    doTest("x=[a, #c\n b]", new String[]{"Py:IDENTIFIER", "Py:EQ", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:SPACE",
-      "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET"});
+    doTest("x=[a, #c\n b]",
+           "Py:IDENTIFIER", "Py:EQ", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:SPACE", "Py:END_OF_LINE_COMMENT",
+           "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET");
   }
 
   public void testBraceAfterIndent() throws Exception {
-    doTest("x=\n [a,\n  b]", new String[]{"Py:IDENTIFIER", "Py:EQ", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT", "Py:LBRACKET",
-      "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET"});
+    doTest("x=\n [a,\n  b]",
+           "Py:IDENTIFIER", "Py:EQ", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:LBRACKET", "Py:IDENTIFIER", "Py:COMMA", "Py:LINE_BREAK", "Py:IDENTIFIER", "Py:RBRACKET");
   }
 
   public void testBackslash() throws Exception {
-    doTest("a=\\\nb", new String[]{"Py:IDENTIFIER", "Py:EQ", "Py:SPACE", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("a=\\\nb",
+           "Py:IDENTIFIER", "Py:EQ", "Py:SPACE", "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testBackslashAfterSpace() throws Exception {
-    doTest("a = \\\n  b", new String[]{"Py:IDENTIFIER", "Py:SPACE", "Py:EQ", "Py:SPACE", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("a = \\\n  b",
+           "Py:IDENTIFIER", "Py:SPACE", "Py:EQ", "Py:SPACE", "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testIndent() throws Exception {
-    doTest("if a:\n b", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
-      "Py:INDENT", "Py:IDENTIFIER"});
+    doTest("if a:\n b",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:IDENTIFIER");
   }
 
   public void testMultiLineIndent() throws Exception {
-    doTest("if a:\n b\n c", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
-      "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\n c",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testDedent() throws Exception {
-    doTest("if a:\n b\nc", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
-      "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:DEDENT", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\nc",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:DEDENT", "Py:LINE_BREAK",
+           "Py:IDENTIFIER");
   }
 
   public void testMultiDedent() throws Exception {
-    doTest("if a:\n b\n  c\nd", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK",
-      "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER",
-      "Py:STATEMENT_BREAK", "Py:DEDENT", "Py:DEDENT", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\n  c\nd",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT",
+           "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:DEDENT",
+           "Py:DEDENT", "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testEmptyLine() throws Exception {
-    doTest("if a:\n b\n  \n c", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK",
-      "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\n  \n c",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT",
+           "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testEndOfLineSpace() throws Exception {
-    doTest("if a:\n b\n  c   \n  \n  d", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK",
-      "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER",
-      "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\n  c   \n  \n  d",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK",
+           "Py:LINE_BREAK", "Py:IDENTIFIER");
   }
 
   public void testComment() throws Exception {
-    doTest("if a:\n b\n #comment\nc", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK",
-      "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT", "Py:DEDENT",
-      "Py:LINE_BREAK", "Py:IDENTIFIER"});
+    doTest("if a:\n b\n #comment\nc",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:INDENT", "Py:IDENTIFIER", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT", "Py:DEDENT", "Py:LINE_BREAK",
+           "Py:IDENTIFIER");
   }
 
   public void testIndentedComment() throws Exception {
     doTest("#a\n #b\n#c",
-           new String[]{"Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT"});
+           "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT");
   }
 
   public void testIndentedCommentAndCode() throws Exception {
-    doTest("if a:\n #b\n c", new String[]{"Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
-      "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER"});
+    doTest("if a:\n #b\n c",
+           "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK",
+           "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:INDENT", "Py:IDENTIFIER");
   }
 
   public void testWithNotKeyword() throws Exception {
-    doTest("with=as", new String[] { "Py:IDENTIFIER", "Py:EQ", "Py:IDENTIFIER"});
+    doTest("with=as", "Py:IDENTIFIER", "Py:EQ", "Py:IDENTIFIER");
   }
 
   public void _testWithKeyword() throws Exception {
@@ -119,7 +116,7 @@ public class PythonLexerTest extends TestCase {
            "Py:WITH_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:SPACE", "Py:AS_KEYWORD", "Py:SPACE", "Py:IDENTIFIER" });
   }
 
-  private void doTest(String text, String[] expectedTokens) {
+  private static void doTest(String text, String... expectedTokens) {
     Lexer lexer = new PythonIndentingLexer();
     lexer.start(text);
     int idx = 0;