better tests

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt

@@ -33,9 +33,9 @@ class KotlinAndroidGradleIT {
 
             val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
             val cmd = if (SystemInfo.isWindows)
-                listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+                listOf("cmd", "/C", "gradlew.bat", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
             else
-                listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+                listOf("/bin/bash", "./gradlew", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
 
             val builder = ProcessBuilder(cmd)
             builder.directory(projectDir)

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java

@@ -1,4 +1,4 @@
-package AndroidAlfaProject.AndroidAlfa.src.main.java.org.jetbrains.kotlin.gradle.test.androidalfa;
+package org.jetbrains.kotlin.gradle.test.androidalfa;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,6 +7,8 @@ import android.view.Menu;
 import android.view.View;
 import android.widget.Button;
 
+import org.jetbrains.kotlin.gradle.test.androidalfa.R;
+
 public class MainActivity extends Activity {
 
     @Override

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt

@@ -1,36 +1,33 @@
-package org.jetbrains.kotlin.gradle.test.androidalfa;
+package org.jetbrains.kotlin.gradle.test.androidalfa
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
+import android.content.Intent
+import android.os.Bundle
+import android.app.Activity
+import android.view.Menu
+import android.view.View
+import android.widget.Button
+import org.jetbrains.kotlin.gradle.test.androidalfa.R
 
-public class MainActivity2 extends Activity {
+open class MainActivity2: Activity {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main2);
+    protected override fun onCreate(savedInstanceState: Bundle?): Unit {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main2)
 
-        Button next = (Button) findViewById(R.id.Button02);
-        next.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                Intent intent = new Intent();
-                setResult(RESULT_OK, intent);
-                finish();
+        var next: Button = findViewById(R.id.Button02) as Button
+        next.setOnClickListener(object: View.OnClickListener() {
+            public override fun onClick(view: View?): Unit {
+                val intent: Intent = Intent()
+                setResult(RESULT_OK, intent)
+                finish()
             }
-
-        });
+        })
     }
 
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main_activity2, menu);
-        return true;
+        getMenuInflater()?.inflate(R.menu.main_activity2, menu);
+        return true
     }
     
 }