[GNUnet-SVN] r18034 - in gnunet-java: . lib src/org/gnunet/util test test/org test/org/gnunet test/org/gnunet/util test/org/gnunet/util/resources

[gnunet]

Author: dold
Date: 2011-11-07 01:36:12 +0100 (Mon, 07 Nov 2011)
New Revision: 18034

Added:
   gnunet-java/lib/slf4j-jdk14-1.6.4.jar
   gnunet-java/test/org/
   gnunet-java/test/org/gnunet/
   gnunet-java/test/org/gnunet/util/
   gnunet-java/test/org/gnunet/util/ConfigurationTest.java
   gnunet-java/test/org/gnunet/util/resources/
   gnunet-java/test/org/gnunet/util/resources/gnunet.config-1
Modified:
   gnunet-java/.classpath
   gnunet-java/src/org/gnunet/util/Configuration.java
Log:
using JUnit4

Modified: gnunet-java/.classpath
===================================================================
--- gnunet-java/.classpath      2011-11-06 23:41:39 UTC (rev 18033)
+++ gnunet-java/.classpath      2011-11-07 00:36:12 UTC (rev 18034)
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="test"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
+       <classpathentry kind="lib" path="lib/slf4j-jdk14-1.6.4.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Added: gnunet-java/lib/slf4j-jdk14-1.6.4.jar
===================================================================
(Binary files differ)


Property changes on: gnunet-java/lib/slf4j-jdk14-1.6.4.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: gnunet-java/src/org/gnunet/util/Configuration.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Configuration.java  2011-11-06 23:41:39 UTC 
(rev 18033)
+++ gnunet-java/src/org/gnunet/util/Configuration.java  2011-11-07 00:36:12 UTC 
(rev 18034)
@@ -26,9 +26,9 @@
     
     
     private static Pattern section = Pattern.compile("\\[(.*?)\\]");
-    private static Pattern tag = Pattern.compile("(.*?) =( .*?)");
+    private static Pattern tag = Pattern.compile("(.*?) =( ?.*?)");
 
-    private Map<String,Map<String, String>> sections;
+    public Map<String,Map<String, String>> sections;
 
     /**
      * Start with an empty configuration.
@@ -59,7 +59,13 @@
                 logger.warn("error parsing file", e);
                 break;
             }
+            if (line == null) {
+                break;
+            }
             line = line.trim();
+            if (line.length() == 0) {
+                continue;
+            }
             if (line.charAt(0) == '#' || line.charAt(0) == '%') {
                 continue;
             }
@@ -76,7 +82,7 @@
             if (m.matches()) {
                 String option = m.group(1).trim();
                 String value = m.group(2).trim();
-                if (value.charAt(0) == '"') {
+                if (value.length() != 0 && value.charAt(0) == '"') {
                     int last = value.lastIndexOf('"', 1);
                     if (last == -1) {
                         logger.warn("error parsing file: incorrect quoting");

Added: gnunet-java/test/org/gnunet/util/ConfigurationTest.java
===================================================================
--- gnunet-java/test/org/gnunet/util/ConfigurationTest.java                     
        (rev 0)
+++ gnunet-java/test/org/gnunet/util/ConfigurationTest.java     2011-11-07 
00:36:12 UTC (rev 18034)
@@ -0,0 +1,22 @@
+package org.gnunet.util;
+
+import java.io.FileNotFoundException;
+import java.net.URL;
+
+import org.junit.Test;
+
+public class ConfigurationTest {
+
+    @Test
+    public void testConfiguration() throws FileNotFoundException {
+        Configuration c = new Configuration();
+        
+        String path = 
ConfigurationTest.class.getResource("resources/gnunet.config-1").getPath();
+        
+        c.parse(path);
+        
+        System.out.println(c.sections);
+        
+    }
+
+}

Added: gnunet-java/test/org/gnunet/util/resources/gnunet.config-1
===================================================================
--- gnunet-java/test/org/gnunet/util/resources/gnunet.config-1                  
        (rev 0)
+++ gnunet-java/test/org/gnunet/util/resources/gnunet.config-1  2011-11-07 
00:36:12 UTC (rev 18034)
@@ -0,0 +1,9 @@
+[foo]
+%asdf
+# foo
+   # foo
+bar = baz
+bla = xd
+spam =
+
+