azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename methods (prefix -> prefixes)

Browse Source
This commit is contained in:
Nikolay Krasko
2013-04-03 19:03:11 +04:00
parent 170363cd5a
commit e242f31dff
14 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java
+9 -9
View File
@@ -36,7 +36,7 @@ public final class InTextDirectivesUtils {
@Nullable
public static Integer getPrefixedInt(String fileText, String prefix) {
String[] numberStrings = findArrayWithPrefix(fileText, prefix);
String[] numberStrings = findArrayWithPrefixes(fileText, prefix);
if (numberStrings.length > 0) {
return Integer.parseInt(numberStrings[0]);
}
@@ -45,15 +45,15 @@ public final class InTextDirectivesUtils {
}
@NotNull
public static String[] findArrayWithPrefix(String fileText, String... prefixes) {
return ArrayUtil.toStringArray(findListWithPrefix(fileText, prefixes));
public static String[] findArrayWithPrefixes(String fileText, String... prefixes) {
return ArrayUtil.toStringArray(findListWithPrefixes(fileText, prefixes));
}
@NotNull
public static List<String> findListWithPrefix(String fileText, String... prefixes) {
public static List<String> findListWithPrefixes(String fileText, String... prefixes) {
List<String> result = new ArrayList<String>();
for (String line : findLinesWithPrefixRemoved(fileText, prefixes)) {
for (String line : findLinesWithPrefixesRemoved(fileText, prefixes)) {
String[] variants = line.split(",");
for (String variant : variants) {
@@ -65,18 +65,18 @@ public final class InTextDirectivesUtils {
}
@Nullable
public static String findStringWithPrefix(String fileText, String... prefixes) {
List<String> strings = findListWithPrefix(fileText, prefixes);
public static String findStringWithPrefixes(String fileText, String... prefixes) {
List<String> strings = findListWithPrefixes(fileText, prefixes);
if (strings.isEmpty()) {
return null;
}
assert strings.size() == 1 : "There is more than one string with given prefixes " +
Arrays.toString(prefixes) + ". Use findListWithPrefix() instead.";
Arrays.toString(prefixes) + ". Use findListWithPrefixes() instead.";
return strings.get(0);
}
@NotNull
public static List<String> findLinesWithPrefixRemoved(String fileText, String... prefixes) {
public static List<String> findLinesWithPrefixesRemoved(String fileText, String... prefixes) {
List<String> result = new ArrayList<String>();
List<String> cleanedPrefixes = cleanDirectivesFromComments(Arrays.asList(prefixes));
compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultConstructorCodegenTest.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.List;
import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefix;
import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefixes;
public abstract class AbstractDefaultConstructorCodegenTest extends CodegenTestCase {
@@ -64,7 +64,7 @@ public abstract class AbstractDefaultConstructorCodegenTest extends CodegenTestC
}
private String loadInstructionValue(String fileContent, String instructionName) {
List<String> testedClass = findListWithPrefix(fileContent, "// " + instructionName + ": ");
List<String> testedClass = findListWithPrefixes(fileContent, "// " + instructionName + ": ");
assertTrue("Cannot find " + instructionName + " instruction", !testedClass.isEmpty());
assertTrue(instructionName + " instruction must have only one element", testedClass.size() == 1);
return testedClass.get(0);
compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
+6 -6
View File
@@ -31,8 +31,8 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.util.List;
import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefix;
import static org.jetbrains.jet.InTextDirectivesUtils.findStringWithPrefix;
import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefixes;
import static org.jetbrains.jet.InTextDirectivesUtils.findStringWithPrefixes;
/*
* Test correctness of written flags in class file
@@ -94,7 +94,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
private static TestedObject parseExpectedTestedObject(String fileText) {
TestedObject result = new TestedObject();
List<String> testedObjects = findListWithPrefix(fileText, "// TESTED_OBJECTS: ");
List<String> testedObjects = findListWithPrefixes(fileText, "// TESTED_OBJECTS: ");
assertTrue("Cannot find TESTED_OBJECTS instruction", !testedObjects.isEmpty());
result.containingClass = testedObjects.get(0);
if (testedObjects.size() == 1) {
@@ -108,8 +108,8 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
"TESTED_OBJECTS instruction must contains one (for class) or two (for function and property) values");
}
result.kind = findStringWithPrefix(fileText, "// TESTED_OBJECT_KIND: ");
List<String> isFullName = findListWithPrefix(fileText, "// IS_FULL_CONTAINING_CLASS_NAME: ");
result.kind = findStringWithPrefixes(fileText, "// TESTED_OBJECT_KIND: ");
List<String> isFullName = findListWithPrefixes(fileText, "// IS_FULL_CONTAINING_CLASS_NAME: ");
if (isFullName.size() == 1) {
result.isFullContainingClassName = Boolean.parseBoolean(isFullName.get(0));
}
@@ -150,7 +150,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
private static int getExpectedFlags(String text) {
int expectedAccess = 0;
Class klass = Opcodes.class;
List<String> flags = findListWithPrefix(text, "// FLAGS: ");
List<String> flags = findListWithPrefixes(text, "// FLAGS: ");
for (String flag : flags) {
try {
Field field = klass.getDeclaredField(flag);