summaryrefslogtreecommitdiff
path: root/android/testData/guiTests
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2014-08-04 10:42:32 -0700
committerAlex Ruiz <alruiz@google.com>2014-08-04 10:57:59 -0700
commita148fce28e38520dc53b78b6b90944fd522ba549 (patch)
tree557168ac4cdb5dbe68624b8e7840f02cca8b0ed7 /android/testData/guiTests
parent63d771f5b949005a3b990020ebc94d9221b223e6 (diff)
downloadidea-a148fce28e38520dc53b78b6b90944fd522ba549.tar.gz
Now we recreate .idea folder when opening project in UI test.
Change-Id: Ib694db5072008846e615b7bdffa3d10974981f17
Diffstat (limited to 'android/testData/guiTests')
-rw-r--r--android/testData/guiTests/Issue74341/.gitignore9
-rw-r--r--android/testData/guiTests/SimpleApplication/.gitignore9
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/compiler.xml23
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/copyright/profiles_settings.xml3
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/encodings.xml5
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/gradle.xml18
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/misc.xml7
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/scopes/scope_settings.xml5
-rw-r--r--android/testData/guiTests/SimpleApplication/.idea/vcs.xml7
-rw-r--r--android/testData/guiTests/SimpleApplication/app/app.iml20
-rw-r--r--android/testData/guiTests/commonFiles/.idea/compiler.xml (renamed from android/testData/guiTests/Issue74341/.idea/compiler.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/copyright/profiles_settings.xml (renamed from android/testData/guiTests/Issue74341/.idea/copyright/profiles_settings.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/encodings.xml (renamed from android/testData/guiTests/Issue74341/.idea/encodings.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/gradle.xml (renamed from android/testData/guiTests/Issue74341/.idea/gradle.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/misc.xml (renamed from android/testData/guiTests/Issue74341/.idea/misc.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/scopes/scope_settings.xml (renamed from android/testData/guiTests/Issue74341/.idea/scopes/scope_settings.xml)0
-rw-r--r--android/testData/guiTests/commonFiles/.idea/vcs.xml (renamed from android/testData/guiTests/Issue74341/.idea/vcs.xml)0
17 files changed, 35 insertions, 71 deletions
diff --git a/android/testData/guiTests/Issue74341/.gitignore b/android/testData/guiTests/Issue74341/.gitignore
index ddc986d9a38..633eda8b112 100644
--- a/android/testData/guiTests/Issue74341/.gitignore
+++ b/android/testData/guiTests/Issue74341/.gitignore
@@ -1,8 +1,15 @@
.gradle
/gradle
/local.properties
-/.idea/workspace.xml
+/.idea/copyright
+/.idea/scopes
/.idea/libraries
+/.idea/compiler.xml
+/.idea/encodings.xml
+/.idea/gradle.xml
+/.idea/misc.xml
+/.idea/vcs.xml
+/.idea/workspace.xml
.DS_Store
/build
gradlew
diff --git a/android/testData/guiTests/SimpleApplication/.gitignore b/android/testData/guiTests/SimpleApplication/.gitignore
index ddc986d9a38..633eda8b112 100644
--- a/android/testData/guiTests/SimpleApplication/.gitignore
+++ b/android/testData/guiTests/SimpleApplication/.gitignore
@@ -1,8 +1,15 @@
.gradle
/gradle
/local.properties
-/.idea/workspace.xml
+/.idea/copyright
+/.idea/scopes
/.idea/libraries
+/.idea/compiler.xml
+/.idea/encodings.xml
+/.idea/gradle.xml
+/.idea/misc.xml
+/.idea/vcs.xml
+/.idea/workspace.xml
.DS_Store
/build
gradlew
diff --git a/android/testData/guiTests/SimpleApplication/.idea/compiler.xml b/android/testData/guiTests/SimpleApplication/.idea/compiler.xml
deleted file mode 100644
index 217af471a9e..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <resourceExtensions />
- <wildcardResourcePatterns>
- <entry name="!?*.java" />
- <entry name="!?*.form" />
- <entry name="!?*.class" />
- <entry name="!?*.groovy" />
- <entry name="!?*.scala" />
- <entry name="!?*.flex" />
- <entry name="!?*.kt" />
- <entry name="!?*.clj" />
- </wildcardResourcePatterns>
- <annotationProcessing>
- <profile default="true" name="Default" enabled="false">
- <processorPath useClasspath="true" />
- </profile>
- </annotationProcessing>
- </component>
-</project>
-
diff --git a/android/testData/guiTests/SimpleApplication/.idea/copyright/profiles_settings.xml b/android/testData/guiTests/SimpleApplication/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3377d..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
- <settings default="" />
-</component> \ No newline at end of file
diff --git a/android/testData/guiTests/SimpleApplication/.idea/encodings.xml b/android/testData/guiTests/SimpleApplication/.idea/encodings.xml
deleted file mode 100644
index e206d70d859..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/android/testData/guiTests/SimpleApplication/.idea/gradle.xml b/android/testData/guiTests/SimpleApplication/.idea/gradle.xml
deleted file mode 100644
index 736c7b5cffc..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="GradleSettings">
- <option name="linkedExternalProjectsSettings">
- <GradleProjectSettings>
- <option name="distributionType" value="DEFAULT_WRAPPED" />
- <option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="modules">
- <set>
- <option value="$PROJECT_DIR$" />
- <option value="$PROJECT_DIR$/app" />
- </set>
- </option>
- </GradleProjectSettings>
- </option>
- </component>
-</project>
-
diff --git a/android/testData/guiTests/SimpleApplication/.idea/misc.xml b/android/testData/guiTests/SimpleApplication/.idea/misc.xml
deleted file mode 100644
index 518ed0687d6..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/build/classes" />
- </component>
-</project>
-
diff --git a/android/testData/guiTests/SimpleApplication/.idea/scopes/scope_settings.xml b/android/testData/guiTests/SimpleApplication/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8433..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
- <state>
- <option name="SKIP_IMPORT_STATEMENTS" value="false" />
- </state>
-</component> \ No newline at end of file
diff --git a/android/testData/guiTests/SimpleApplication/.idea/vcs.xml b/android/testData/guiTests/SimpleApplication/.idea/vcs.xml
deleted file mode 100644
index def6a6a1845..00000000000
--- a/android/testData/guiTests/SimpleApplication/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="" />
- </component>
-</project>
-
diff --git a/android/testData/guiTests/SimpleApplication/app/app.iml b/android/testData/guiTests/SimpleApplication/app/app.iml
index 9547340464e..1f9b9e0e172 100644
--- a/android/testData/guiTests/SimpleApplication/app/app.iml
+++ b/android/testData/guiTests/SimpleApplication/app/app.iml
@@ -56,7 +56,25 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
diff --git a/android/testData/guiTests/Issue74341/.idea/compiler.xml b/android/testData/guiTests/commonFiles/.idea/compiler.xml
index 217af471a9e..217af471a9e 100644
--- a/android/testData/guiTests/Issue74341/.idea/compiler.xml
+++ b/android/testData/guiTests/commonFiles/.idea/compiler.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/copyright/profiles_settings.xml b/android/testData/guiTests/commonFiles/.idea/copyright/profiles_settings.xml
index e7bedf3377d..e7bedf3377d 100644
--- a/android/testData/guiTests/Issue74341/.idea/copyright/profiles_settings.xml
+++ b/android/testData/guiTests/commonFiles/.idea/copyright/profiles_settings.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/encodings.xml b/android/testData/guiTests/commonFiles/.idea/encodings.xml
index e206d70d859..e206d70d859 100644
--- a/android/testData/guiTests/Issue74341/.idea/encodings.xml
+++ b/android/testData/guiTests/commonFiles/.idea/encodings.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/gradle.xml b/android/testData/guiTests/commonFiles/.idea/gradle.xml
index 736c7b5cffc..736c7b5cffc 100644
--- a/android/testData/guiTests/Issue74341/.idea/gradle.xml
+++ b/android/testData/guiTests/commonFiles/.idea/gradle.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/misc.xml b/android/testData/guiTests/commonFiles/.idea/misc.xml
index 518ed0687d6..518ed0687d6 100644
--- a/android/testData/guiTests/Issue74341/.idea/misc.xml
+++ b/android/testData/guiTests/commonFiles/.idea/misc.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/scopes/scope_settings.xml b/android/testData/guiTests/commonFiles/.idea/scopes/scope_settings.xml
index 922003b8433..922003b8433 100644
--- a/android/testData/guiTests/Issue74341/.idea/scopes/scope_settings.xml
+++ b/android/testData/guiTests/commonFiles/.idea/scopes/scope_settings.xml
diff --git a/android/testData/guiTests/Issue74341/.idea/vcs.xml b/android/testData/guiTests/commonFiles/.idea/vcs.xml
index def6a6a1845..def6a6a1845 100644
--- a/android/testData/guiTests/Issue74341/.idea/vcs.xml
+++ b/android/testData/guiTests/commonFiles/.idea/vcs.xml