From c8a5446695269368f03d8e9676ab7612f0cf7894 Mon Sep 17 00:00:00 2001
From: gojomo <gojomo@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Tue, 12 May 2009 02:10:37 +0000
Subject: [PATCH] Test robustness * SelfTestBase.java     don't allow negative
 random passwords, in case leading '-' is causing problems * Heritrix.java    
 echo arguments when showing usage info -- to understand what went wrong

---
 engine/src/main/java/org/archive/crawler/Heritrix.java   | 9 +++++----
 .../java/org/archive/crawler/selftest/SelfTestBase.java  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/Heritrix.java b/engine/src/main/java/org/archive/crawler/Heritrix.java
index dddd56b2..b0171936 100644
--- a/engine/src/main/java/org/archive/crawler/Heritrix.java
+++ b/engine/src/main/java/org/archive/crawler/Heritrix.java
@@ -113,9 +113,10 @@ public class Heritrix {
     private static final String STARTLOG = "heritrix_dmesg.log";
 
     
-    private static void usage(PrintStream out) {
+    private static void usage(PrintStream out, String[] args) {
         HelpFormatter hf = new HelpFormatter();
         hf.printHelp("Heritrix", options());
+        out.print("Your arguments were: "+args);
     }
     
     
@@ -161,12 +162,12 @@ public class Heritrix {
         try {
             cl = clp.parse(options(), args);
         } catch (ParseException e) {
-            usage(out);
+            usage(out, args);
             return null;
         }
         
         if (cl.getArgList().size() != 0) {
-            usage(out);
+            usage(out, args);
             return null;
         }
 
@@ -215,7 +216,7 @@ public class Heritrix {
         if (cl == null) return;
 
         if (cl.hasOption('h')) {
-          usage(startupOut);
+          usage(startupOut, args);
           return ;
         }
         
diff --git a/engine/src/test/java/org/archive/crawler/selftest/SelfTestBase.java b/engine/src/test/java/org/archive/crawler/selftest/SelfTestBase.java
index f327aa17..42559779 100644
--- a/engine/src/test/java/org/archive/crawler/selftest/SelfTestBase.java
+++ b/engine/src/test/java/org/archive/crawler/selftest/SelfTestBase.java
@@ -195,7 +195,7 @@ public abstract class SelfTestBase extends TmpDirTestCase {
     
     protected void startHeritrix(String path) throws Exception {
         String authPassword = 
-            (new BigInteger(SecureRandom.getSeed(16))).toString(16);
+            (new BigInteger(SecureRandom.getSeed(16))).abs().toString(16);
         String[] args = { "-j", path + "/jobs", "-a", authPassword };
         // TODO: add auth password? 
         heritrix = new Heritrix();