From 92d281e4239b9ef1bebd35968d17ad4b5e3e7d88 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Wed, 6 Jan 2016 16:36:49 -0800
Subject: [PATCH] Move zip verification to tests.

---
 .../src/main/kotlin/com/beust/kobalt/Args.kt             | 4 ----
 src/main/kotlin/com/beust/kobalt/Main.kt                 | 7 ++++---
 .../kotlin/com/beust/kobalt}/VerifyKobaltZip.kt          | 9 +++++----
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename src/{main/kotlin/com/beust/kobalt/app => test/kotlin/com/beust/kobalt}/VerifyKobaltZip.kt (92%)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
index 0e79db38..bf1b44e8 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
@@ -56,9 +56,5 @@ class Args {
 
     @Parameter(names = arrayOf("--update"), description = "Update to the latest version of Kobalt")
     var update: Boolean = false
-
-    @Parameter(names = arrayOf("--verifyDistribution"), description = "Verify the distribution",
-            hidden = true)
-    var verifyDistribution: Boolean = false
 }
 
diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index f66c87f1..07968094 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -5,7 +5,10 @@ import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.api.PluginTask
 import com.beust.kobalt.api.Project
-import com.beust.kobalt.app.*
+import com.beust.kobalt.app.BuildFileCompiler
+import com.beust.kobalt.app.MainModule
+import com.beust.kobalt.app.ProjectGenerator
+import com.beust.kobalt.app.UpdateKobalt
 import com.beust.kobalt.app.remote.KobaltClient
 import com.beust.kobalt.app.remote.KobaltServer
 import com.beust.kobalt.internal.PluginInfo
@@ -149,8 +152,6 @@ private class Main @Inject constructor(
             if (args.update) {
                 // --update
                 updateKobalt.updateKobalt()
-            } else if (args.verifyDistribution) {
-                VerifyKobaltZip().run()
             } else {
                 //
                 // Everything below requires to parse the build file first
diff --git a/src/main/kotlin/com/beust/kobalt/app/VerifyKobaltZip.kt b/src/test/kotlin/com/beust/kobalt/VerifyKobaltZip.kt
similarity index 92%
rename from src/main/kotlin/com/beust/kobalt/app/VerifyKobaltZip.kt
rename to src/test/kotlin/com/beust/kobalt/VerifyKobaltZip.kt
index 22b74fcd..fa209399 100644
--- a/src/main/kotlin/com/beust/kobalt/app/VerifyKobaltZip.kt
+++ b/src/test/kotlin/com/beust/kobalt/VerifyKobaltZip.kt
@@ -1,15 +1,16 @@
-package com.beust.kobalt.app
+package com.beust.kobalt
 
-import com.beust.kobalt.KobaltException
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.log
+import org.testng.annotations.Test
 import java.io.FileInputStream
 import java.util.jar.JarFile
 import java.util.jar.JarInputStream
 
-class VerifyKobaltZip {
-    fun run() {
+class VerifyKobaltZipTest : KobaltTest() {
+    @Test
+    fun verifyZipFile() {
         var success = true
         var foundKobaltw = false
         var foundJar = false