Outputing the function counter to XML.

Now, globalFunctions tag appears in the header of the xml output file.
Kuniri · May 12, 2017 · d1ed4d4 · d1ed4d4
1 parent 717f57f
commit d1ed4d4
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 2 deletions.
diff --git a/lib/kuniri/parser/output_format.rb b/lib/kuniri/parser/output_format.rb
@@ -81,6 +81,7 @@ def handle_cond_loop_and_block(singleElement)
     def handle_global_functions(singleElement)
       funcs = singleElement.global_functions
       len = funcs.length
+      function_counter_generate(len)
       generate_global_functions(funcs) if len.positive?
     end
 
@@ -117,6 +118,10 @@ def function_behaviour_generate(_pElementName, _pFunction)
       raise NotImplementedError
     end
 
+    def function_counter_generate(_pCounterLabel, _numberOfFunctons)
+      raise NotImplementedError
+    end
+
     def global_variable_generate(_pGlobalVariable)
       raise NotImplementedError
     end

diff --git a/lib/kuniri/parser/xml_output_format.rb b/lib/kuniri/parser/xml_output_format.rb
@@ -61,6 +61,11 @@ def function_behaviour_generate(pElementName, pFunction)
       end
     end
 
+    def function_counter_generate(pNumberOfFunctions)
+      @outputEngine.send('globalFunctions',
+                         counter: pNumberOfFunctions)
+    end
+
     # @see OutputFormat
     def parameters_generate(pParameters)
       if pParameters.is_a?Hash

diff --git a/spec/parser/xmlSchemaValidate/class_data.xsd b/spec/parser/xmlSchemaValidate/class_data.xsd
@@ -2,6 +2,15 @@
   <xs:element name="kuniri">
     <xs:complexType>
       <xs:sequence>
+        <xs:element name="globalFunctions" maxOccurs="unbounded" minOccurs="0">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:string" name="counter"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="externRequirementData" maxOccurs="unbounded" minOccurs="0">
           <xs:complexType>
             <xs:simpleContent>

diff --git a/spec/parser/xmlSchemaValidate/fullCodeTwo.xsd b/spec/parser/xmlSchemaValidate/fullCodeTwo.xsd
@@ -6,7 +6,16 @@
           <xs:complexType>
             <xs:simpleContent>
               <xs:extension base="xs:string">
-              <xs:attribute type="xs:string" name="name"/>
+                <xs:attribute type="xs:string" name="name"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="globalFunctions">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:byte" name="counter"/>
               </xs:extension>
             </xs:simpleContent>
           </xs:complexType>

diff --git a/spec/parser/xmlSchemaValidate/fullCodeWithComments.xsd b/spec/parser/xmlSchemaValidate/fullCodeWithComments.xsd
@@ -6,7 +6,16 @@
           <xs:complexType>
             <xs:simpleContent>
               <xs:extension base="xs:string">
-              <xs:attribute type="xs:string" name="name"/>
+                <xs:attribute type="xs:string" name="name"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="globalFunctions">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:byte" name="counter"/>
               </xs:extension>
             </xs:simpleContent>
           </xs:complexType>

diff --git a/spec/parser/xmlSchemaValidate/simpleFunction.xsd b/spec/parser/xmlSchemaValidate/simpleFunction.xsd
@@ -2,6 +2,15 @@
   <xs:element name="kuniri">
     <xs:complexType>
       <xs:sequence>
+        <xs:element name="globalFunctions">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:byte" name="counter"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="functionData" maxOccurs="unbounded" minOccurs="0">
           <xs:complexType mixed="true">
             <xs:sequence>

diff --git a/spec/parser/xml_builder_engine_spec.rb b/spec/parser/xml_builder_engine_spec.rb
@@ -214,6 +214,7 @@
 
     it "Full global function" do
       @builder.kuniri do
+        globalFunctions :counter => "1"
         functionData :name => "xpto", :visibility => "global" do
           parameterData :name => "two"
           conditionalData :type => "if", :expression => "y == x"
@@ -223,6 +224,7 @@
 
       output = [@basicHeader,
                 '<kuniri>',
+                '  <globalFunctions counter="1"/>',
                 '  <functionData name="xpto" visibility="global">',
                 '    <parameterData name="two"/>',
                 '    <conditionalData type="if" expression="y == x"/>',

diff --git a/spec/parser/xml_output_format_spec.rb b/spec/parser/xml_output_format_spec.rb
@@ -310,6 +310,10 @@
       expect(@handler.elements[4].attributes['name']).to eq('globalVariable')
     end
 
+    it 'Verify if the global function counter is correct' do
+      expect(@handler.elements[8].attributes['counter']).to eq('0')
+    end
+
     #TODO: FINISH THIS TEST, AFTER FIX THE GLOBAL VARIABLE BUG
 
     after :each do

diff --git a/tests/cli_test.sh b/tests/cli_test.sh
@@ -24,6 +24,7 @@ create_test_file() {
   cat <<EOF >expected_result.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <kuniri>
+  <globalFunctions counter="0"/>
   <classData name="Simple1" visibility="public">
   </classData>
   <classData name="Simple2" visibility="public">