From 44fa60717f3347875477d91d4e41874c1c212eb1 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 24 Apr 2017 21:52:30 +0300
Subject: [PATCH] Update AndroidTestCase to AS 2.3 + Android tests refactoring

GitOrigin-RevId: 98859c9d573d2c1f94c6762201711ff9601c2742
---
 .../nested.kt.AndroidManifest.xml.expected                   | 2 +-
 .../simple.kt.AndroidManifest.xml.expected                   | 2 +-
 .../nested.kt.AndroidManifest.xml.expected                   | 2 +-
 .../simple.kt.AndroidManifest.xml.expected                   | 2 +-
 .../nested.kt.AndroidManifest.xml.expected                   | 2 +-
 .../simple.kt.AndroidManifest.xml.expected                   | 2 +-
 .../simpleFunction/expected/res/layout/activity_main.xml     | 5 ++---
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/nested.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/nested.kt.AndroidManifest.xml.expected
index 67606787f901..d8243000449e 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/nested.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/nested.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <activity android:name=".Test$MyActivity"/>
+        <activity android:name=".Test$MyActivity" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/simple.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/simple.kt.AndroidManifest.xml.expected
index d357760073e5..fecc806699c0 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/simple.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addActivityToManifest/simple.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <activity android:name=".MyActivity"/>
+        <activity android:name=".MyActivity" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/nested.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/nested.kt.AndroidManifest.xml.expected
index 80e688c51930..5b063ef3f47f 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/nested.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/nested.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <receiver android:name=".Test$MyReceiver"/>
+        <receiver android:name=".Test$MyReceiver" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/simple.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/simple.kt.AndroidManifest.xml.expected
index 413772c9367c..8cdf19ac2d90 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/simple.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addBroadcastReceiverToManifest/simple.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <receiver android:name=".MyReceiver"/>
+        <receiver android:name=".MyReceiver" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/nested.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/nested.kt.AndroidManifest.xml.expected
index 0e2a7618c271..843009de167c 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/nested.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/nested.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <service android:name=".Test$MyService"/>
+        <service android:name=".Test$MyService" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/simple.kt.AndroidManifest.xml.expected b/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/simple.kt.AndroidManifest.xml.expected
index 64b5f5bd7b70..2df134f40b5f 100644
--- a/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/simple.kt.AndroidManifest.xml.expected
+++ b/plugins/kotlin/idea/tests/testData/android/intention/addServiceToManifest/simple.kt.AndroidManifest.xml.expected
@@ -5,6 +5,6 @@
 
 
     <application>
-        <service android:name=".MyService"/>
+        <service android:name=".MyService" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml
index fb3d8a258054..3509b84116ac 100644
--- a/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml
+++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 </LinearLayout>
\ No newline at end of file