From 0b4c411cff4020ac898a4c817880e7667c7a5eca Mon Sep 17 00:00:00 2001
From: Matthew Dawson <matthew@mjdsystems.ca>
Date: Sat, 25 Oct 2014 15:28:19 -0400
Subject: [PATCH] Add necessary tests to verify left grid conversions.

Left grid is now successfully converted.  The old conversion function is now
updated to match the new jTET system.

Also silence the conversion function, extra output is not nice.
---
 +TableBlock/convert_hierarchical_grid_to_java.m |  8 ++++----
 +TableBlock/convert_table_to_java_table.m       |  2 +-
 Tests/ConversionTest1.m                         | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/+TableBlock/convert_hierarchical_grid_to_java.m b/+TableBlock/convert_hierarchical_grid_to_java.m
index e719c07..6254b15 100644
--- a/+TableBlock/convert_hierarchical_grid_to_java.m
+++ b/+TableBlock/convert_hierarchical_grid_to_java.m
@@ -13,15 +13,15 @@
 function convert_hierarchical_grid_to_java(grid, java_grid)
 
 for i=1:size(grid,2)
-    new_cell = ca.mcscert.jtet.tablularexpression.HierarchicalCell;
+    new_cell = ca.mcscert.jtet.tabularexpression.HierarchicalCell;
     
-    old_cell = grid(i)
+    old_cell = grid(i);
     new_cell.setContents(old_cell.cond_text)
     
     if ~isempty(old_cell.subgrid)
-        TableBlock.convert_hierarchical_grid_to_java(old_cell.subgrid.cells, new_cell.getSubHiearchy())
+        TableBlock.convert_hierarchical_grid_to_java(old_cell.subgrid.cells, new_cell.getSubHierarchy())
     end
-    java_grid.add(new_cell)
+    java_grid.add(new_cell);
 end
 
 end
diff --git a/+TableBlock/convert_table_to_java_table.m b/+TableBlock/convert_table_to_java_table.m
index b0464e0..d42315a 100644
--- a/+TableBlock/convert_table_to_java_table.m
+++ b/+TableBlock/convert_table_to_java_table.m
@@ -7,5 +7,5 @@ function outtable = convert_table_to_java_table( intable )
     vc = ca.mcscert.jtet.expression.VariableCollection(TET.getInstance.getVariableParser.parseVariables(intable.function_inputs), ca.mcscert.jtet.expression.PartialVariableCollection(outputVariables));
     outtable = ca.mcscert.jtet.tabularexpression.Table(intable.function_name, vc);
 
+    TableBlock.convert_hierarchical_grid_to_java(intable.Grid2.cells, outtable.getLeftGrid().getSubHierarchy())
 end
-
diff --git a/Tests/ConversionTest1.m b/Tests/ConversionTest1.m
index 052d589..d15d8ef 100644
--- a/Tests/ConversionTest1.m
+++ b/Tests/ConversionTest1.m
@@ -21,6 +21,21 @@ classdef ConversionTest1 < BaseConversionTest
             testcase.assertEqual(char(outVar.get('output').name()), 'output');
         end
 
+        function testLeftGridConversion(testcase)
+            grid = testcase.ConvertedTable.getLeftGrid().getSubHierarchy();
+            testcase.assertEqual(grid.size(), 2)
+            testcase.assertEqual(char(grid.get(0).contents()), 'Start')
+            testcase.assertEqual(grid.get(0).getSubHierarchy().size(), 0)
+            testcase.assertEqual(char(grid.get(1).contents()), '~Start')
+
+            grid = grid.get(1).getSubHierarchy();
+            testcase.assertEqual(grid.size(), 2)
+            testcase.assertEqual(char(grid.get(0).contents()), 'Input < 1000')
+            testcase.assertEqual(grid.get(0).getSubHierarchy().size(), 0)
+            testcase.assertEqual(char(grid.get(1).contents()), 'Input >= 1000')
+            testcase.assertEqual(grid.get(1).getSubHierarchy().size(), 0)
+        end
+
         function testTopGridConversion(testcase)
             testcase.assertEqual(testcase.ConvertedTable.getTopGrid().getSubHierarchy().size(), 0)
         end
-- 
GitLab