Merge 7ef9b909dc7efc89fe59bd78e3f875548726c2d0 into 5a5202eaca0cbf289215e1e0e40e8426ee128ee3

scripts/insert-ignores.sh

@@ -4,12 +4,22 @@ for file in `find . -name "*Test.java"`; do
   tempfile="/tmp/insert-ignores.tmp"
 
   echo -e "\n\n\n*** $file ******************************"
-  cat $file | \
-  sed 's/import org.junit.Test;/import org.junit.Test;\
-import org.junit.Ignore;/' | \
-  sed 's/@Test/@Ignore\
-    @Test/' | \
-  sed '1,/@Ignore/s/.*@Ignore//' > "$tempfile" \
-  && mv "$tempfile" "$file"
+
+#ignoreFound variable will check if already Ignore is imported or not.
+ignoreFound=`grep -q 'import org.junit.Ignore;' $file ; echo $?` > /dev/null
+
+#if ignore is not imported then add line for import
+if [ $ignoreFound -ne 0 ]
+then
+  cat $file | sed 's/import org.junit.Test;/import org.junit.Test;\
+import org.junit.Ignore;/' >  $tempfile
+  mv "$tempfile" "$file"
+  pwd
+fi
+
+# This AWK code will check for missing Ignore with the @Test and add it
+
+  awk 'BEGIN{igonreset=0;firsttest=1}{if($0~/.*@Ignore.*/){igonreset=1}if($0 ~ /^.*@Test/){if(igonreset!=1 && firsttest==0){print "    @Ignore(\"Remove to run test\")";}firsttest=0;igonreset=0}print $0}' $file > $tempfile
+  mv "$tempfile" "$file"
 done