From 2c659068f7fcc8f9a100d7f6608513623813b512 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Thu, 28 Mar 2002 18:57:34 +0000
Subject: [PATCH] Expanded imports; moved test code into unit test class.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@684 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../src/java/com/samskivert/util/Config.java  | 50 ++-----------
 .../java/com/samskivert/util/ConfigTest.java  | 75 +++++++++++++++++++
 2 files changed, 81 insertions(+), 44 deletions(-)
 create mode 100644 projects/samskivert/tests/src/java/com/samskivert/util/ConfigTest.java

diff --git a/projects/samskivert/src/java/com/samskivert/util/Config.java b/projects/samskivert/src/java/com/samskivert/util/Config.java
index ce885997..dd0f0935 100644
--- a/projects/samskivert/src/java/com/samskivert/util/Config.java
+++ b/projects/samskivert/src/java/com/samskivert/util/Config.java
@@ -1,5 +1,5 @@
 //
-// $Id: Config.java,v 1.8 2002/02/17 08:28:34 mdb Exp $
+// $Id: Config.java,v 1.9 2002/03/28 18:57:34 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -21,7 +21,11 @@
 package com.samskivert.util;
 
 import java.io.IOException;
-import java.util.*;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Properties;
 
 import com.samskivert.Log;
 
@@ -382,48 +386,6 @@ public class Config
         return props.getProperty(key);
     }
 
-    public static void main (String[] args)
-    {
-        Config config = new Config();
-        try {
-            config.bindProperties("test", "com/samskivert/util/test");
-
-            System.out.println("test.prop1: " +
-                               config.getValue("test.prop1", 1));
-            System.out.println("test.prop2: " +
-                               config.getValue("test.prop2", "two"));
-
-            int[] ival = new int[] { 1, 2, 3 };
-            ival = config.getValue("test.prop3", ival);
-            System.out.println("test.prop3: " + StringUtil.toString(ival));
-
-            String[] sval = new String[] { "one", "two", "three" };
-            sval = config.getValue("test.prop4", sval);
-            System.out.println("test.prop4: " + StringUtil.toString(sval));
-
-            System.out.println("test.prop5: " +
-                               config.getValue("test.prop5", "undefined"));
-
-            Iterator iter = config.keys("test.prop2");
-            while (iter.hasNext()) {
-                System.out.println(iter.next());
-            }
-
-            iter = config.keys("test.prop");
-            while (iter.hasNext()) {
-                System.out.println(iter.next());
-            }
-
-            iter = config.keys("test");
-            while (iter.hasNext()) {
-                System.out.println(iter.next());
-            }
-
-        } catch (IOException ioe) {
-            ioe.printStackTrace(System.err);
-        }
-    }
-
     protected Hashtable _props = new Hashtable();
 
     protected static final String PROPS_SUFFIX = ".properties";
diff --git a/projects/samskivert/tests/src/java/com/samskivert/util/ConfigTest.java b/projects/samskivert/tests/src/java/com/samskivert/util/ConfigTest.java
new file mode 100644
index 00000000..781b0a11
--- /dev/null
+++ b/projects/samskivert/tests/src/java/com/samskivert/util/ConfigTest.java
@@ -0,0 +1,75 @@
+//
+// $Id: ConfigTest.java,v 1.1 2002/03/28 18:57:34 mdb Exp $
+
+package com.samskivert.util;
+
+import java.io.IOException;
+
+import java.util.Iterator;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+/**
+ * Tests the {@link Config} class.
+ */
+public class ConfigTest extends TestCase
+{
+    public ConfigTest ()
+    {
+        super(ConfigTest.class.getName());
+    }
+
+    public void runTest ()
+    {
+        Config config = new Config();
+        try {
+            config.bindProperties("test", "rsrc/util/test");
+
+            System.out.println("test.prop1: " +
+                               config.getValue("test.prop1", 1));
+            System.out.println("test.prop2: " +
+                               config.getValue("test.prop2", "two"));
+
+            int[] ival = new int[] { 1, 2, 3 };
+            ival = config.getValue("test.prop3", ival);
+            System.out.println("test.prop3: " + StringUtil.toString(ival));
+
+            String[] sval = new String[] { "one", "two", "three" };
+            sval = config.getValue("test.prop4", sval);
+            System.out.println("test.prop4: " + StringUtil.toString(sval));
+
+            System.out.println("test.prop5: " +
+                               config.getValue("test.prop5", "undefined"));
+
+            Iterator iter = config.keys("test.prop2");
+            while (iter.hasNext()) {
+                System.out.println(iter.next());
+            }
+
+            iter = config.keys("test.prop");
+            while (iter.hasNext()) {
+                System.out.println(iter.next());
+            }
+
+            iter = config.keys("test");
+            while (iter.hasNext()) {
+                System.out.println(iter.next());
+            }
+
+        } catch (IOException ioe) {
+            ioe.printStackTrace(System.err);
+        }
+    }
+
+    public static Test suite ()
+    {
+        return new ConfigTest();
+    }
+
+    public static void main (String[] args)
+    {
+        ConfigTest test = new ConfigTest();
+        test.runTest();
+    }
+}