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

Slightly optimize tests

Browse Source
This commit is contained in:
Nikolay Krasko
2012-08-30 15:26:03 +04:00
parent 7e1091a6af
commit 3cbe2a270b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
+7 -4
View File
@@ -155,6 +155,7 @@ public class ExpectedCompletionUtils {
protected static void assertContainsRenderedItems(CompletionProposal[] expected, LookupElement[] items, boolean checkOrder) { protected static void assertContainsRenderedItems(CompletionProposal[] expected, LookupElement[] items, boolean checkOrder) {
List<CompletionProposal> itemsInformation = getItemsInformation(items); List<CompletionProposal> itemsInformation = getItemsInformation(items);
String allItemsString = listToString(itemsInformation);
int indexOfPrevious = Integer.MIN_VALUE; int indexOfPrevious = Integer.MIN_VALUE;
@@ -167,7 +168,7 @@ public class ExpectedCompletionUtils {
if (proposal.isSuitable(expectedProposal)) { if (proposal.isSuitable(expectedProposal)) {
isFound = true; isFound = true;
Assert.assertTrue("Invalid order of existent elements in " + listToString(itemsInformation), Assert.assertTrue("Invalid order of existent elements in " + allItemsString,
!checkOrder || index > indexOfPrevious); !checkOrder || index > indexOfPrevious);
indexOfPrevious = index; indexOfPrevious = index;
@@ -175,16 +176,17 @@ public class ExpectedCompletionUtils {
} }
} }
Assert.assertTrue("Expected '" + expectedProposal + "' not found in " + listToString(itemsInformation), isFound); Assert.assertTrue("Expected '" + expectedProposal + "' not found in " + allItemsString, isFound);
} }
} }
protected static void assertNotContainsRenderedItems(CompletionProposal[] unexpected,LookupElement[] items) { protected static void assertNotContainsRenderedItems(CompletionProposal[] unexpected,LookupElement[] items) {
List<CompletionProposal> itemsInformation = getItemsInformation(items); List<CompletionProposal> itemsInformation = getItemsInformation(items);
String allItemsString = listToString(itemsInformation);
for (CompletionProposal unexpectedProposal : unexpected) { for (CompletionProposal unexpectedProposal : unexpected) {
for (CompletionProposal proposal : itemsInformation) { for (CompletionProposal proposal : itemsInformation) {
Assert.assertFalse("Unexpected '" + unexpectedProposal + "' presented in " + listToString(itemsInformation), Assert.assertFalse("Unexpected '" + unexpectedProposal + "' presented in " + allItemsString,
proposal.isSuitable(unexpectedProposal)); proposal.isSuitable(unexpectedProposal));
} }
} }
@@ -197,7 +199,8 @@ public class ExpectedCompletionUtils {
if (items != null) { if (items != null) {
for (LookupElement item : items) { for (LookupElement item : items) {
item.renderElement(presentation); item.renderElement(presentation);
result.add(new ExpectedCompletionUtils.CompletionProposal(item.getLookupString(), presentation.getItemText(), presentation.getTailText())); result.add(new ExpectedCompletionUtils.CompletionProposal(item.getLookupString(), presentation.getItemText(),
presentation.getTailText()));
} }
} }