No commit message

hosagrahara · Oct 5, 2012 · 074274a · 074274a
1 parent 3af7faf
commit 074274a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/ReadYamlRaw.m b/ReadYamlRaw.m
@@ -54,7 +54,7 @@
 
     persistent nsfe;
 
-    if isempty(nsfe) && exist('nosuchfileaction','var')
+    if exist('nosuchfileaction','var') %isempty(nsfe) && 
         nsfe = nosuchfileaction;
     end;
 
@@ -181,7 +181,7 @@
         if iskw_import(ich)
             result.(ich) = perform_import(r.get(java.lang.String(ich)));
         else
-            result.(ich) = scan(r.get(java.lang.String(ich)));
+            result.(genvarname(ich)) = scan(r.get(java.lang.String(ich)));
         end;
     end;
     if not(exist('result','var'))

diff --git a/Tests/Data/test_primitives/whitespaces.yaml b/Tests/Data/test_primitives/whitespaces.yaml
@@ -0,0 +1,3 @@
+YAML: 1.0
+Image file: 00032009.jpg
+Contours count: 8
diff --git a/Tests/selftest_report.html b/Tests/selftest_report.html
@@ -1,3 +1 @@
-<<<<<<< .mine
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"   "http://www.w3.org/TR/html4/strict.dtd"><HTML> <HEAD><TITLE>::SELFTEST REPORT::</TITLE><STYLE> H2{color:blue} #MainTest{border: 1px blue solid;} h3,h4,h5,h6 {display: inline;}     </STYLE></HEAD><BODY style="font-family:Arial, helvetica"><h1>Selftest report from:29-Dec-2011 14:37:32</h1><div id="MainTest"> <h2>test_ReadYaml</h2><div id="Test"><h3>test_ReadYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_RY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Import: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportDef: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportNonex: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Inheritance: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceLoop: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceMultiple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Time: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_TimeVariants: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div><div id="MainTest"> <h2>test_WriteYaml</h2><div id="Test"><h3>test_WriteYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_WY_ComplexStructure: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div></BODY></HTML>=======
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"   "http://www.w3.org/TR/html4/strict.dtd"><HTML> <HEAD><TITLE>::SELFTEST REPORT::</TITLE><STYLE> H2{color:blue} #MainTest{border: 1px blue solid;} h3,h4,h5,h6 {display: inline;}     </STYLE></HEAD><BODY style="font-family:Arial, helvetica"><h1>Selftest report from:01-Dec-2011 08:56:08</h1><div id="MainTest"> <h2>test_ReadYaml</h2><div id="Test"><h3>test_ReadYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_RY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Import: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportDef: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportNonex: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Inheritance: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceLoop: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceMultiple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_TimeVariants: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div><div id="MainTest"> <h2>test_WriteYaml</h2><div id="Test"><h3>test_WriteYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_WY_ComplexStructure: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div></BODY></HTML>>>>>>>> .r69
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"   "http://www.w3.org/TR/html4/strict.dtd"><HTML> <HEAD><TITLE>::SELFTEST REPORT::</TITLE><STYLE> H2{color:blue} #MainTest{border: 1px blue solid;} h3,h4,h5,h6 {display: inline;}     </STYLE></HEAD><BODY style="font-family:Arial, helvetica"><h1>Selftest report from:05-Oct-2012 10:08:53</h1><div id="MainTest"> <h2>test_ReadYaml</h2><div id="Test"><h3>test_ReadYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_RY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Import: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportDef: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportNonex: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Inheritance: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceLoop: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceMultiple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_TimeVariants: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Whitespaces: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div><div id="MainTest"> <h2>test_WriteYaml</h2><div id="Test"><h3>test_WriteYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_WY_ComplexStructure: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_usecase_01: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr></table></div></BODY></HTML>
diff --git a/Tests/test_ReadYaml.m b/Tests/test_ReadYaml.m
@@ -9,6 +9,8 @@
     fprintf('Testing read ');
     stat.test_RY_Matrices = test_RY_Matrices();
     fprintf('.');
+    stat.test_RY_Whitespaces = test_RY_Whitespaces();
+    fprintf('.');
     stat.test_RY_FloatingPoints = test_RY_FloatingPoints();
     fprintf('.');
     stat.test_RY_Indentation = test_RY_Indentation();
@@ -273,6 +275,21 @@
     end;
 end
 
+function stat = test_RY_Whitespaces()
+    stat.ok = 1;
+    stat.desc = '';
+    try
+        ry = ReadYaml([PTH_PRIMITIVES() 'whitespaces.yaml']);
+        if ~isfield(ry,'ImageFile') || ~isfield(ry,'ContoursCount')         
+            stat.desc  = 'Wrong values loaded';
+            stat.ok = 0;         
+        end;
+    catch
+        stat.ok = 0;
+        stat.desc = 'Crash';
+    end;
+end
+
 function stat = test_RY_usecase_01()
     stat.ok = 1;
     stat.desc = '';
@@ -289,6 +306,7 @@
     end;
 end
 
+
 function stat = test_ReadYaml_SimpleStructure()
 
 stat.ok = 1;