Changeset 2494

Timestamp:

Aug 8, 2006, 1:20:26 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

• Fixed problem with FlatFileParser? skipping every other section.
• Fixed problem with ignored error message in TestFlatFileParser?.

Location:

trunk/src

Files:

• core/net/sf/basedb/util/parser/FlatFileParser.java (modified) (1 diff)
• test/TestFlatFileParser.java (modified) (5 diffs)

trunk/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -797 +797 @@
     throws IOException
   {
-    if (nextData == null)
+    if (nextData == null && nextSection == null)
     {
       boolean done = false;

trunk/src/test/TestFlatFileParser.java

@@ -1 +1 @@
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -115 +115 @@
       write("--Parse OK (" + file + ")");
     }
-    catch (Exception ex)
+    catch (Throwable ex)
     {
       write("--Parse FAILED (" + file + ")");
@@ -127 +127 @@
     try
     {
-      ArrayList<String> sections = new ArrayList<String>(Arrays.asList("[FileInformation]", "[Block1]", "[Block2]", "[Block3]", "[Block4]", "[mapping]")); 
+      Set<String> sections = new HashSet<String>(Arrays.asList("FileInformation", "Block1", "Block2", "Block3", "Block4", "mapping")); 
       InputStream in = FileUtil.getInputStream(new java.io.File(file));
       ffp.setInputStream(in);
@@ -134 +134 @@
       {
         section = ffp.nextSection();
-        sections.remove(section.line());
+        sections.remove(section.name());
         ffp.parseHeaders();
         ffp.nextData();
@@ -141 +141 @@
       if (!sections.isEmpty())
       {
-        write("--Parse sections FAILED didnt find all sections in (" + file + "), missed:" + sections);
+        throw new Exception("Didn't find all sections in (" + file + "), missed: " + sections);
       }
       write("--Parse sections OK (" + file + ")");
     }
-    catch (Exception ex)
+    catch (Throwable ex)
     {
       write("--Parse sections FAILED (" + file + ")");