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 CamelHumpMatcher.forceStartMatching from android tests

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-10-10 14:47:39 +04:00
parent 2ad8cfdffa
commit f24fc7ba67
17 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/testData/dom/animator/tn.xml
+2 -2
View File
@@ -1,3 +1,3 @@
<set xmlns:android="http://schemas.android.com/apk/res/android">
<anima<caret>
<set>
<objectAnima<caret>
</set>
plugins/android/testData/dom/animator/tn_after.xml
+2 -2
View File
@@ -1,3 +1,3 @@
<set xmlns:android="http://schemas.android.com/apk/res/android">
<animator
<set>
<objectAnimator
</set>
plugins/android/testData/dom/layout/commonPrefixIdea63531.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView lay<caret>
<LinearLayout>
<ImageView layou<caret>
</LinearLayout>
plugins/android/testData/dom/layout/commonPrefixIdea63531_after.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:lay<caret>
<ImageView android:layout_<caret>
</LinearLayout>
plugins/android/testData/dom/layout/tn11.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<LinearLayout>
<android.widget.Butt<caret>
<android.widget.RadioBut<caret>
</LinearLayout>
plugins/android/testData/dom/layout/tn11_after.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<LinearLayout>
<android.widget.Button
<android.widget.RadioButton
</LinearLayout>
plugins/android/testData/dom/layout/tn7.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<android.widget.Butt<caret> xmlns:android="http://schemas.android.com/apk/res/android">
<android.widget.RadioButt<caret> xmlns:android="http://schemas.android.com/apk/res/android">
plugins/android/testData/dom/layout/tn7_after.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<android.widget.Button xmlns:android="http://schemas.android.com/apk/res/android">
<android.widget.RadioButton>
plugins/android/testData/dom/layout/tn9.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<LinearLayout>
<Butt<caret>
<RadioButt<caret>
</LinearLayout>
plugins/android/testData/dom/layout/tn9_after.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<LinearLayout>
<Button
<RadioButton
</LinearLayout>
plugins/android/testData/dom/resources/attrs1.xml
+1 -1
View File
@@ -2,6 +2,6 @@
<resources>
<declare-styleable name="LabelView">
<attr name="text" format="s<caret>"/>
<attr name="text" format="st<caret>"/>
</declare-styleable>
</resources>
plugins/android/testSrc/org/jetbrains/android/dom/AndroidAnimatorDomTest.java
-2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
/**
* @author Eugene.Kudelevsky
@@ -43,7 +42,6 @@ public class AndroidAnimatorDomTest extends AndroidDomTest {
}
public void testTagNames() throws Throwable {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
toTestCompletion("tn.xml", "tn_after.xml");
}
plugins/android/testSrc/org/jetbrains/android/dom/AndroidLayoutDomTest.java
+15 -6
View File
@@ -3,7 +3,6 @@ package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.openapi.application.ApplicationManager;
@@ -33,7 +32,6 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
@Override
public void setUp() throws Exception {
super.setUp();
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, SdkConstants.FN_ANDROID_MANIFEST_XML);
}
@@ -63,7 +61,10 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
}
public void testCommonPrefixIdea63531() throws Throwable {
toTestCompletion("commonPrefixIdea63531.xml", "commonPrefixIdea63531_after.xml");
VirtualFile file = copyFileToProject("commonPrefixIdea63531.xml");
myFixture.configureFromExistingVirtualFile(file);
myFixture.complete(CompletionType.BASIC);
myFixture.checkResultByFile(testFolder + '/' + "commonPrefixIdea63531_after.xml");
}
public void testHighlighting() throws Throwable {
@@ -220,7 +221,11 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
}
public void testTagNameCompletion1() throws Throwable {
toTestCompletion("tn1.xml", "tn1_after.xml");
VirtualFile file = copyFileToProject("tn1.xml");
myFixture.configureFromExistingVirtualFile(file);
myFixture.complete(CompletionType.BASIC);
myFixture.type('\n');
myFixture.checkResultByFile(testFolder + '/' + "tn1_after.xml");
}
public void testFlagCompletion() throws Throwable {
@@ -278,7 +283,10 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
}
public void testTagNameCompletion3() throws Throwable {
doTestCompletionVariants("tn3.xml", "View", "ViewAnimator", "ViewFlipper", "ViewStub", "ViewSwitcher");
doTestCompletionVariants("tn3.xml", "AdapterViewFlipper", "AppWidgetHostView", "AutoCompleteTextView", "CalendarView",
"CheckedTextView", "ExpandableListView", "GridView", "HorizontalScrollView", "ImageView", "KeyboardView",
"ListView", "MultiAutoCompleteTextView", "ScrollView", "SearchView", "StackView", "SurfaceView", "TextView",
"TextureView", "VideoView", "View", "ViewAnimator", "ViewFlipper", "ViewStub", "ViewSwitcher");
}
/*public void testTagNameCompletion4() throws Throwable {
@@ -375,7 +383,8 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
}
public void testTextViewRootTag_IDEA_62889() throws Throwable {
doTestCompletionVariants("textViewRootTag.xml", "TextView", "TextureView");
doTestCompletionVariants("textViewRootTag.xml", "AutoCompleteTextView", "CheckedTextView", "MultiAutoCompleteTextView", "TextView",
"TextureView");
}
public void testRequestFocus() throws Throwable {
plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java
+1 -3
View File
@@ -1,7 +1,6 @@
package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import org.jetbrains.android.inspections.AndroidElementNotAllowedInspection;
import org.jetbrains.android.inspections.AndroidUnknownAttributeInspection;
@@ -23,8 +22,7 @@ public class AndroidManifestDomTest extends AndroidDomTest {
}
public void testAttributeNameCompletion2() throws Throwable {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
doTestCompletionVariants("an2.xml", "debuggable", "description");
doTestCompletionVariants("an2.xml", "debuggable", "description", "hasCode");
}
public void testAttributeNameCompletion3() throws Throwable {
plugins/android/testSrc/org/jetbrains/android/dom/AndroidValueResourcesTest.java
-2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction;
@@ -89,7 +88,6 @@ public class AndroidValueResourcesTest extends AndroidDomTest {
}
public void testAttrFormatCompletion() throws Throwable {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
toTestCompletion("attrs1.xml", "attrs1_after.xml");
}
plugins/android/testSrc/org/jetbrains/android/dom/AndroidXmlResourcesDomTest.java
-2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import com.intellij.openapi.vfs.VirtualFile;
import java.util.List;
@@ -51,7 +50,6 @@ public class AndroidXmlResourcesDomTest extends AndroidDomTest {
}
public void testPreferenceChildrenCompletion() throws Throwable {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
toTestCompletion("pref2.xml", "pref2_after.xml");
}
plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java
-3
View File
@@ -1,6 +1,5 @@
package org.jetbrains.android.intentions;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.openapi.actionSystem.IdeActions;
@@ -37,7 +36,6 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase {
}
public void test1() throws IOException {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
doTest();
}
@@ -84,7 +82,6 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase {
}
public void test11() throws IOException {
CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
doTest(new Runnable() {
@Override
public void run() {