Commit 855f8f41 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Properly test and parse single output table variables. 

Setup a simple test and properly deal with single output tables that use a
real output type.
parent 0bdf7b31

+TableBlock/convert_table_to_java_table.m

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ function outtable = convert_table_to_java_table( intable ) 
%   This function converts a table from TET's internal representation to

%   jTET's representation, ready for use against any of jTET's tools.



    outtable = ca.mcscert.jtet.tabularexpression.Table(intable.function_name, []);

    outputVariables = java.util.Arrays.asList([ca.mcscert.jtet.expression.Variable('output', ca.mcscert.jtet.expression.RealVariableType())]);

    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);



end

Tests/ConversionTest1.m

+15 −0
Original line number Diff line number Diff line
@@ -6,5 +6,20 @@ classdef ConversionTest1 < BaseConversionTest 
        File = 'data/test1data.mat'

        TableName = 'Startup_Limiter'

    end



    methods (Test)

        function testVariableParsing(testcase)

            vc = testcase.ConvertedTable.getVariables();



            inVar = vc.getInputVariables();

            testcase.assertEqual(inVar.size(), 2);

            testcase.assertEqual(char(inVar.get('Start').name()), 'Start');

            testcase.assertEqual(char(inVar.get('Input').name()), 'Input');



            outVar = vc.getOutputVariables();

            testcase.assertEqual(outVar.size(), 1);

            testcase.assertEqual(char(outVar.get('output').name()), 'output');

        end

    end

end