From 950d6e9f100f21285b3c6fdd75c6883a90c7aff4 Mon Sep 17 00:00:00 2001
From: dsavvinov <dsavvinov@gmail.com>
Date: Mon, 15 Aug 2016 12:31:31 +0300
Subject: [PATCH] Protobuf: removed generating stub package in Protobuf
 messages. Fixed tests accordingly

---
 .../protoc-test-project.iws                   | 106 +++++++++++++-----
 .../src/kt_java_tests/BaseExtendedTest.kt     |  20 ++--
 .../src/kt_java_tests/ConnectTest.kt          |  19 ++--
 .../src/kt_java_tests/CrossBranchTest.kt      |  22 ++--
 .../src/kt_java_tests/DirectionTest.kt        |   6 +-
 .../src/kt_java_tests/Location.kt             |  10 +-
 .../src/kt_java_tests/MultipleMessagesTest.kt |  14 +--
 .../src/kt_java_tests/RandomGen.kt            |   2 +-
 .../src/kt_java_tests/RepeatedVarintsTest.kt  |  10 +-
 .../src/kt_java_tests/RepeatedZigZag.kt       |  12 +-
 .../src/kt_java_tests/TagOrderTests.kt        |   9 +-
 .../src/kt_java_tests/Util.kt                 |  24 +---
 .../src/kt_java_tests/VarintsTest.kt          |   7 +-
 .../src/kt_java_tests/ZigZagTests.kt          |   6 +-
 .../src/kt_java_tests/main.kt                 |   2 +-
 .../kotlin/src/kotlin_file_generator.cc       |   4 -
 16 files changed, 142 insertions(+), 131 deletions(-)

diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws
index ff45d20cb90..3613dbdb2f7 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws
@@ -80,7 +80,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
-      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
+      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="756">
@@ -90,6 +90,28 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="BaseExtendedTest.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="72">
+              <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+              <folding>
+                <element signature="e#23#171#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="base_message.kt" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -357,8 +379,6 @@
         <option value="$PROJECT_DIR$/src/tests/Util.kt" />
         <option value="$PROJECT_DIR$/src/tests/VarintsTest.kt" />
         <option value="$PROJECT_DIR$/src/main/kotlin/WireType.kt" />
-        <option value="$PROJECT_DIR$/build.gradle" />
-        <option value="$PROJECT_DIR$/src/kotlin/base_message.kt" />
         <option value="$PROJECT_DIR$/src/kotlin/connect.kt" />
         <option value="$PROJECT_DIR$/src/kotlin/cross_branch.kt" />
         <option value="$PROJECT_DIR$/src/kotlin/direction.kt" />
@@ -381,8 +401,10 @@
         <option value="$PROJECT_DIR$/src/kt_java_tests/Location.kt" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/CrossBranchTest.kt" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/ConnectTest.kt" />
-        <option value="$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/Util.kt" />
+        <option value="$PROJECT_DIR$/build.gradle" />
+        <option value="$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt" />
+        <option value="$PROJECT_DIR$/src/kotlin/base_message.kt" />
       </list>
     </option>
   </component>
@@ -401,7 +423,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="3840" />
-    <option name="y" value="48" />
+    <option name="y" value="-2112" />
     <option name="width" value="3840" />
     <option name="height" value="2112" />
   </component>
@@ -482,8 +504,40 @@
               <option name="myItemId" value="src" />
               <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
             </PATH_ELEMENT>
+          </PATH>
+          <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="tests" />
+              <option name="myItemId" value="protoc-test-project" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="protoc-test-project" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kt_java_tests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="protoc-test-project" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="protoc-test-project" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kotlin" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -962,15 +1016,15 @@
       <workItem from="1470904528165" duration="51301000" />
       <workItem from="1471248559073" duration="28000" />
       <workItem from="1471248659432" duration="1881000" />
-      <workItem from="1471250698982" duration="1755000" />
+      <workItem from="1471250698982" duration="2717000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3668000" />
+    <option name="totallyTimeSpent" value="4630000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="3840" y="48" width="3840" height="2112" extended-state="6" />
+    <frame x="3840" y="-2112" width="3840" height="2112" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1159,14 +1213,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/kotlin/cross_branch.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1343,14 +1389,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="156" column="8" selection-start-line="156" selection-start-column="8" selection-end-line="156" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/kt_java_tests/Util.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1367,6 +1405,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="72">
+          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+          <folding>
+            <element signature="e#23#171#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
index a7cc1c21651..29150574b42 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
@@ -1,17 +1,13 @@
-package tests
+package kt_java_tests
 
 import java_msg.BaseMessage
 import java_msg.ExtendedMessage
-import main.kotlin.Base
-import main.kotlin.CodedInputStream
-import main.kotlin.Extended
+import Base
+import CodedInputStream
+import Extended
 import java.io.ByteArrayOutputStream
 
 
-/**
- * Created by user on 8/11/16.
- */
-
 object BaseExtendedTest {
     fun generateKtBaseMessage(): Base {
         val arrSize = RandomGen.rnd.nextInt(1000)
@@ -95,13 +91,13 @@ object BaseExtendedTest {
                 .build()
     }
 
-    fun compareBases(kt: main.kotlin.Base, jv: BaseMessage.Base): Boolean {
+    fun compareBases(kt: Base, jv: BaseMessage.Base): Boolean {
         return kt.flag == jv.flag &&
                 kt.int == jv.int &&
                 Util.compareArrays(kt.arr.asIterable(), jv.arrList)
     }
 
-    fun compareExtended(kt: main.kotlin.Extended, jv: ExtendedMessage.Extended): Boolean {
+    fun compareExtended(kt: Extended, jv: ExtendedMessage.Extended): Boolean {
         return kt.flag == jv.flag &&
                 kt.int == jv.int &&
                 Util.compareArrays(kt.arr.asIterable(), jv.arrList) &&
@@ -109,13 +105,13 @@ object BaseExtendedTest {
                 kt.long == jv.long
     }
 
-    fun compareBaseKtToJavaExtended(kt: main.kotlin.Base, jv: ExtendedMessage.Extended): Boolean {
+    fun compareBaseKtToJavaExtended(kt: Base, jv: ExtendedMessage.Extended): Boolean {
         return kt.flag == jv.flag &&
                 kt.int == jv.int &&
                 Util.compareArrays(kt.arr.asIterable(), jv.arrList)
     }
 
-    fun compareExtendedKtToJavaBase(kt: main.kotlin.Extended, jv: BaseMessage.Base): Boolean {
+    fun compareExtendedKtToJavaBase(kt: Extended, jv: BaseMessage.Base): Boolean {
         return kt.flag == jv.flag &&
                 kt.int == jv.int &&
                 Util.compareArrays(kt.arr.asIterable(), jv.arrList)
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
index 1c5f77c93ed..e934cc29ac8 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
@@ -1,11 +1,12 @@
-package tests
+package kt_java_tests
 
 import java_msg.Connect
-import main.kotlin.CodedInputStream
+import CodedInputStream
+import ConnectionRequest
 import java.io.ByteArrayOutputStream
 
 object ConnectTest {
-    fun generateKotlinConnectionRequestMessage(): main.kotlin.ConnectionRequest {
+    fun generateKotlinConnectionRequestMessage(): ConnectionRequest {
         val arrSize = RandomGen.rnd.nextInt(1000)
         val arr = IntArray(arrSize)
         for (i in 0..(arrSize - 1)) {
@@ -14,7 +15,7 @@ object ConnectTest {
 
         val port = RandomGen.rnd.nextInt()
 
-        val msg = main.kotlin.ConnectionRequest.BuilderConnectionRequest(arr, port).build()
+        val msg = ConnectionRequest.BuilderConnectionRequest(arr, port).build()
 
         return msg
     }
@@ -36,7 +37,7 @@ object ConnectTest {
 
 
 
-    fun compareConnectionRequests(kt: main.kotlin.ConnectionRequest, jv: Connect.ConnectionRequest): Boolean {
+    fun compareConnectionRequests(kt: ConnectionRequest, jv: Connect.ConnectionRequest): Boolean {
         return Util.compareArrays(kt.ip.asIterable(), jv.ipList.asIterable())
     }
 
@@ -50,8 +51,7 @@ object ConnectTest {
         val jvConnectionRequest = Connect.ConnectionRequest.parseFrom(ins)
 
         Util.assert(ktConnectionRequest.errorCode == 0)
-        Util.assert(Util.compareArrays(ktConnectionRequest.ip.asIterable(), jvConnectionRequest.ipList))
-        Util.assert(ktConnectionRequest.port == jvConnectionRequest.port)
+        Util.assert(compareConnectionRequests(ktConnectionRequest, jvConnectionRequest))
     }
 
     val testRuns = 10
@@ -68,11 +68,10 @@ object ConnectTest {
         val jvConnectionRequest = generateJavaConnectionRequest()
         jvConnectionRequest.writeTo(outs)
         val ins = CodedInputStream(outs.toByteArray())
-        val ktConnectionRequest = main.kotlin.ConnectionRequest.BuilderConnectionRequest(IntArray(0), 0).parseFrom(ins)
+        val ktConnectionRequest = ConnectionRequest.BuilderConnectionRequest(IntArray(0), 0).parseFrom(ins).build()
 
         Util.assert(ktConnectionRequest.errorCode == 0)
-        Util.assert(Util.compareArrays(ktConnectionRequest.ip.asIterable(), jvConnectionRequest.ipList))
-        Util.assert(ktConnectionRequest.port == jvConnectionRequest.port)
+        Util.assert(compareConnectionRequests(ktConnectionRequest, jvConnectionRequest))
     }
 
     fun JavaToKt() {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
index 92a7dab17ca..f34b7ca2a00 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
@@ -1,19 +1,15 @@
-package tests
+package kt_java_tests
 
 import java_msg.CrossBranchOuterClass
-import main.kotlin.CodedInputStream
-import main.kotlin.CrossBranch
+import CodedInputStream
+import CrossBranch
 import java.io.ByteArrayOutputStream
 
-/**
- * Created by user on 8/11/16.
- */
-
 object CrossBranchTest {
-    fun generateKtGrandFather(): main.kotlin.CrossBranch.Grandfather {
-        fun generateKtRightFather(): main.kotlin.CrossBranch.Grandfather.RightFather {
-            fun generateKtRightLeftSon(): main.kotlin.CrossBranch.Grandfather.RightFather.RightLeftSon {
-                fun generateKtLeftLeftSon(): main.kotlin.CrossBranch.Grandfather.LeftFather.LeftLeftSon {
+    fun generateKtGrandFather(): CrossBranch.Grandfather {
+        fun generateKtRightFather(): CrossBranch.Grandfather.RightFather {
+            fun generateKtRightLeftSon(): CrossBranch.Grandfather.RightFather.RightLeftSon {
+                fun generateKtLeftLeftSon(): CrossBranch.Grandfather.LeftFather.LeftLeftSon {
                     return CrossBranch.Grandfather.LeftFather.LeftLeftSon.BuilderLeftLeftSon(RandomGen.rnd.nextInt()).build()
                 }
 
@@ -24,7 +20,7 @@ object CrossBranchTest {
             }
 
             fun generateKtRightRightSon(): CrossBranch.Grandfather.RightFather.RightRightSon {
-                fun generateKtLeftRightSon(): main.kotlin.CrossBranch.Grandfather.LeftFather.LeftRightSon {
+                fun generateKtLeftRightSon(): CrossBranch.Grandfather.LeftFather.LeftRightSon {
                     return CrossBranch.Grandfather.LeftFather.LeftRightSon.BuilderLeftRightSon(RandomGen.rnd.nextInt()).build()
                 }
 
@@ -33,7 +29,7 @@ object CrossBranchTest {
                 ).build()
             }
 
-            val msg = main.kotlin.CrossBranch.Grandfather.RightFather.BuilderRightFather(
+            val msg = CrossBranch.Grandfather.RightFather.BuilderRightFather(
                     generateKtRightLeftSon(),
                     generateKtRightRightSon()
             ).build()
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
index 0eb858df00c..2ba342732fb 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
@@ -1,8 +1,8 @@
-package tests
+package kt_java_tests
 
 import java_msg.Direction
-import main.kotlin.CodedInputStream
-import main.kotlin.DirectionRequest
+import CodedInputStream
+import DirectionRequest
 import java.io.ByteArrayOutputStream
 
 object DirectionTest {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
index 80ec7384c81..55da1a83176 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
@@ -1,14 +1,10 @@
-package tests
+package kt_java_tests
 
 import java_msg.Location
-import main.kotlin.CodedInputStream
-import main.kotlin.LocationResponse
+import CodedInputStream
+import LocationResponse
 import java.io.ByteArrayOutputStream
 
-/**
- * Created by user on 8/11/16.
- */
-
 object Location {
     fun generateKtLocationResponse(): LocationResponse {
         fun generateKtLocationData(): LocationResponse.LocationData {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
index 478a04db0ac..d7fe1a73101 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
@@ -1,16 +1,12 @@
-package tests
+package kt_java_tests
 
 import java_msg.MultipleMessages
-import main.kotlin.CodedInputStream
-import main.kotlin.FirstMessage
-import main.kotlin.SecondMessage
-import main.kotlin.ThirdMessage
+import CodedInputStream
+import FirstMessage
+import SecondMessage
+import ThirdMessage
 import java.io.ByteArrayOutputStream
 
-/**
- * Created by user on 8/11/16.
- */
-
 object MultipleMessagesTest {
     fun generateKtFirstMessage(): FirstMessage {
         return FirstMessage.BuilderFirstMessage(RandomGen.rnd.nextInt()).build()
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
index 0a50191d1c0..79b2720a199 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
@@ -1,4 +1,4 @@
-package tests
+package kt_java_tests
 
 import java.util.*
 
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
index 914fb05b5f5..a506c0528d7 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
@@ -1,14 +1,10 @@
-package tests
+package kt_java_tests
 
 import java_msg.RepeatedVarints
-import main.kotlin.CodedInputStream
-import main.kotlin.MessageRepeatedVarints
+import CodedInputStream
+import MessageRepeatedVarints
 import java.io.ByteArrayOutputStream
 
-/**
- * Created by user on 8/12/16.
- */
-
 object RepeatedVarintsTest {
     fun generateKtRepeatedVarints(): MessageRepeatedVarints {
         val int = Util.generateIntArray()
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
index 2c06c1241c3..7d68aa961af 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
@@ -1,14 +1,10 @@
-package tests
+package kt_java_tests
 
 import java_msg.RepeatedZigzag
-import main.kotlin.CodedInputStream
-import main.kotlin.MessageRepeatedZigZag
+import CodedInputStream
+import MessageRepeatedZigZag
 import java.io.ByteArrayOutputStream
 
-/**
- * Created by user on 8/12/16.
- */
-
 object RepeatedZigZag {
     fun generateKtRepeatedZigZag(): MessageRepeatedZigZag {
         val int = Util.generateIntArray()
@@ -27,7 +23,7 @@ object RepeatedZigZag {
 
     fun compareRepeatedZigZags(kt: MessageRepeatedZigZag, jv: RepeatedZigzag.MessageRepeatedZigZag): Boolean {
         return Util.compareArrays(kt.int.asIterable(), jv.intList) &&
-                Util.compareArrays(kt.long.asIterable(), jv.longList);
+                Util.compareArrays(kt.long.asIterable(), jv.longList)
     }
 
     fun ktToJavaOnce() {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
index e7a0ba0ea9c..450d6a816ed 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
@@ -1,11 +1,10 @@
-package tests
+package kt_java_tests
 
-import java_msg.RepeatedZigzag
 import java_msg.TagOrderOuterClass
 import java_msg.TagOrderShuffledOuterClass
-import main.kotlin.CodedInputStream
-import main.kotlin.TagOrder
-import main.kotlin.TagOrderShuffled
+import CodedInputStream
+import TagOrder
+import TagOrderShuffled
 import java.io.ByteArrayOutputStream
 
 object TagOrderTests {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
index 129aa838f1a..2d95f4f40e8 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
@@ -1,11 +1,8 @@
-package tests
+package kt_java_tests
 
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.InputStream
-import java.io.OutputStream
-import java.util.concurrent.locks.Condition
 import kotlin.system.exitProcess
+import CodedOutputStream
 
 object Util {
     var ARRAY_MAX_SIZE = 1000
@@ -21,27 +18,16 @@ object Util {
         return lhs.count() == rhs.count() && lhs.filter { !rhs.contains(it) }.isEmpty()
     }
 
-    fun getKtInputStream(): main.kotlin.CodedInputStream {
-        val ba = ByteArray(100000)
-        val ins = main.kotlin.CodedInputStream(ba)
-        return ins
-    }
-
-    fun getKtOutputStream(size: Int): main.kotlin.CodedOutputStream {
+    fun getKtOutputStream(size: Int): CodedOutputStream {
         val ba = ByteArray(size)
-        val outs = main.kotlin.CodedOutputStream(ba)
+        val outs = CodedOutputStream(ba)
         return outs
     }
 
-    fun KtOutputStreamToInputStream(kt: main.kotlin.CodedOutputStream): InputStream {
+    fun KtOutputStreamToInputStream(kt: CodedOutputStream): InputStream {
         return kt.buffer.inputStream()
     }
 
-    fun KtInputStreamToOutputStream(kt: main.kotlin.CodedInputStream): OutputStream {
-        val baos = ByteArrayOutputStream(kt.buffer.size)
-        return baos
-    }
-
     fun generateIntArray(): IntArray {
         val size = RandomGen.rnd.nextInt(ARRAY_MAX_SIZE)
         val arr = IntArray(size)
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
index 1f64761b4e9..e7355c480c9 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
@@ -1,10 +1,9 @@
-package tests
+package kt_java_tests
 
 import java_msg.Varints
-import main.kotlin.CodedInputStream
-import main.kotlin.MessageVarints
+import CodedInputStream
+import MessageVarints
 import java.io.ByteArrayOutputStream
-import java.util.*
 
 object VarintsTest {
     fun generateKtVarint(): MessageVarints {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
index d89b2fed3b5..8a1c801045c 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
@@ -1,8 +1,8 @@
-package tests
+package kt_java_tests
 
 import java_msg.Zigzag
-import main.kotlin.CodedInputStream
-import main.kotlin.MessageZigZag
+import CodedInputStream
+import MessageZigZag
 import java.io.ByteArrayOutputStream
 
 object ZigZagTests {
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt
index 220adc3f421..b415b0eb07a 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt
@@ -1,4 +1,4 @@
-package tests
+package kt_java_tests
 
 import java_msg.Varints
 
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
index 42ab1c7c758..91ad3f5d58e 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_file_generator.cc
@@ -44,10 +44,6 @@ bool FileGenerator::Generate(const FileDescriptor *file, const string &parameter
         classes.push_back(cgen);
     }
 
-    // generate package directive
-    // XXX: stub here, resolve options properly!
-    printer.Print("package main.kotlin\n");
-
     // Generate code and clean up
     generateCode(&printer, classes);