From ce7f6b83a04ed1e69a2000448993a7565d2d79d2 Mon Sep 17 00:00:00 2001
From: Jonas Pfefferle <pepperjo@apache.org>
Date: Wed, 28 Mar 2018 14:25:35 +0200
Subject: [PATCH] Include test-jars and dependencies in assembly

Add test-jars and test dependencies to jars directory.
Add test option to bin/crail to allow run unit tests from
command line.

Signed-off-by: Jonas Pfefferle <pepperjo@apache.org>
---
 assembly/pom.xml                        | 14 +++++++++++++-
 assembly/src/main/assembly/assembly.xml | 11 +++++++++--
 bin/crail                               |  7 +++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index e6e8be89..e303745e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -41,6 +41,12 @@
       <artifactId>crail-client</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.crail</groupId>
+      <artifactId>crail-client</artifactId>
+      <version>1.0</version>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.apache.crail</groupId>
       <artifactId>crail-namenode</artifactId>
@@ -61,6 +67,12 @@
       <artifactId>crail-storage-nvmf</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.crail</groupId>
+      <artifactId>crail-storage-nvmf</artifactId>
+      <version>1.0</version>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.apache.crail</groupId>
       <artifactId>crail-storage-narpc</artifactId>
@@ -102,7 +114,7 @@
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <executions>       
+        <executions>
           <execution>
             <id>dist</id>
             <phase>package</phase>
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
index a9776e4a..e364a9fe 100644
--- a/assembly/src/main/assembly/assembly.xml
+++ b/assembly/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> 
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
@@ -38,6 +38,13 @@
       <scope>runtime</scope>
       <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>jars</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <unpack>false</unpack>
+      <scope>test</scope>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
   </dependencySets>
 
 </assembly>
diff --git a/bin/crail b/bin/crail
index 0e2d3c63..cdf7c0bc 100755
--- a/bin/crail
+++ b/bin/crail
@@ -30,6 +30,7 @@ function print_usage(){
   echo "  fsck                 run a Crail file check command"
   echo "  fs                   run a Crail shell command"
   echo "  iobench              run a Crail benchmark/test"
+  echo "  test                 run a Crail unit test"
 }
 
 if [ $# = 0 ]; then
@@ -59,9 +60,11 @@ elif [ "$COMMAND" = "fs" ] ; then
 elif [ "$COMMAND" = "getconf" ] ; then
   CLASS=org.apache.crail.hdfs.GetConf
 elif [ "$COMMAND" = "iobench" ] ; then
-  CLASS=org.apache.crail.tools.CrailBenchmark  
+  CLASS=org.apache.crail.tools.CrailBenchmark
 elif [ "$COMMAND" = "hdfsbench" ] ; then
-  CLASS=org.apache.crail.hdfs.tools.HdfsIOBenchmark    
+  CLASS=org.apache.crail.hdfs.tools.HdfsIOBenchmark
+elif [ "$COMMAND" = "test" ] ; then
+  CLASS=org.junit.runner.JUnitCore
 fi
 
 export CLASSPATH="$bin"/../jars/*:"$bin"/../conf:.