MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove TemplateImplUtil method used only in tests

Browse Source
This commit is contained in:
peter
2013-10-17 21:54:33 +02:00
parent e01df0a645
commit 32d29a0a45
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/template/MacroParserTest.java
+5 -5
View File
@@ -10,13 +10,13 @@ import com.intellij.testFramework.LightIdeaTestCase;
public class MacroParserTest extends LightIdeaTestCase {
public void testEmpty() {
Expression e = TemplateImplUtil.parseTemplate("");
Expression e = MacroParser.parse("");
assertTrue(e instanceof ConstantNode);
assertEquals("", e.calculateResult(null).toString());
}
public void testFunction() {
Expression e = TemplateImplUtil.parseTemplate(" variableOfType( \"java.util.Collection\" ) ");
Expression e = MacroParser.parse(" variableOfType( \"java.util.Collection\" ) ");
assertTrue(e instanceof MacroCallNode);
MacroCallNode n = (MacroCallNode) e;
assertTrue(n.getMacro() instanceof VariableOfTypeMacro);
@@ -28,7 +28,7 @@ public class MacroParserTest extends LightIdeaTestCase {
}
public void testVariable() {
Expression e = TemplateImplUtil.parseTemplate("variableOfType(E=\"t\")");
Expression e = MacroParser.parse("variableOfType(E=\"t\")");
Expression[] parameters = ((MacroCallNode) e).getParameters();
assertEquals(1, parameters.length);
assertTrue(parameters [0] instanceof VariableNode);
@@ -38,12 +38,12 @@ public class MacroParserTest extends LightIdeaTestCase {
}
public void testEnd() {
Expression e = TemplateImplUtil.parseTemplate("END");
Expression e = MacroParser.parse("END");
assertTrue(e instanceof EmptyNode);
}
public void testMultipleParams() {
Expression e = TemplateImplUtil.parseTemplate("variableOfType(\"A\", \"B\")");
Expression e = MacroParser.parse("variableOfType(\"A\", \"B\")");
assertTrue(e instanceof MacroCallNode);
MacroCallNode n = (MacroCallNode) e;
assertTrue(n.getMacro() instanceof VariableOfTypeMacro);
platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
+3 -3
View File
@@ -16,15 +16,15 @@
package com.intellij.codeInsight.template.impl;
import com.google.common.annotations.VisibleForTesting;
import com.intellij.codeInsight.template.Expression;
import com.intellij.codeInsight.template.Macro;
import com.intellij.codeInsight.template.macro.MacroFactory;
import com.intellij.lexer.Lexer;
import com.intellij.psi.tree.IElementType;
class MacroParser {
private MacroParser() {
}
@VisibleForTesting
public class MacroParser {
//-----------------------------------------------------------------------------------
public static Expression parse(String expression) {
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java
-6
View File
@@ -16,10 +16,8 @@
package com.intellij.codeInsight.template.impl;
import com.intellij.codeInsight.template.Expression;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.containers.hash.LinkedHashMap;
import org.jetbrains.annotations.NonNls;
/**
* @author Maxim.Mossienko
@@ -47,8 +45,4 @@ public class TemplateImplUtil {
}
return variables;
}
public static Expression parseTemplate(@NonNls String text) {
return MacroParser.parse(text);
}
}