mbt-gen 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c7dc3614c0f3345b728127808e7bd517487298968c8edab06f6436b84d60c1
-  data.tar.gz: 780f4e406e9b84d112074106bb905e48a8eab8fac3e02936ab36f85087381c07
+  metadata.gz: 112610c6e247d3de6fc7c69afc0a668659dbcffc9ee1786967bf4a69d9586520
+  data.tar.gz: d0eea35ebf9689ca1bead1e9efe8e8f2a96b75d45b644484875e383927dd2b91
 SHA512:
-  metadata.gz: 05d34d034b0aa1438c15f47969d8c9bd3d61545d2c9ade72efc0edfcee081e562c9fb3cc6f421e846319bbc43c0fe426b10bf81b8030b5ff560f97942405f5b7
-  data.tar.gz: 9f7b485dc1034d0529c3b8033633a862adb30c938899cfa8ceaaab95e130a10385c7d77c9e5859d31d8f5aeedf271e742e242e8699785ba8936b67df8f8f6b17
+  metadata.gz: 137856eff73bfde902b67a9bdc97426253b036a79be6d1b6e912ceaa6012a27bb27715d3de26fb75210602985b8e8bdbe6e43cf15db8edb4f931db69f9b16c5d
+  data.tar.gz: 37e9195a691a211aca006aef7ba57cfc5a91d46f61327acd0297385911f8d29fe4b60dcd77a3514a3b5565aff7d5517d92413e3a80005eff1b24c204bd83c87e

data/lib/mbt-gen.rb

@@ -596,6 +596,19 @@ def translate_validation_rules_to_SMTLIB(progress, solver, struct, prefix, confi
         new_prefix = key.to_s
       end
       translate_validation_rules_to_SMTLIB(progress, solver, value[:ref], new_prefix, config, options)
+    elsif value[:type] == :objlist then
+      maxLength = value[:model_maxLength]
+      unless maxLength then
+        raise RuntimeError.new("encountered objList without :model_maxLength property!")
+      end
+      maxLength.times do |i|
+        if prefix then
+          new_prefix = "#{prefix.to_s}/#{key}/#{i}"
+        else
+          new_prefix = "#{key.to_s}/#{i}"
+        end
+        translate_validation_rules_to_SMTLIB(progress, solver, value[:ref], new_prefix, config, options)
+      end
     end
   end
 end
@@ -1029,6 +1042,10 @@ def xpath_to_filename(xpath)
   xpath.gsub("/", "-").gsub(/\[\d*\]/) {|s| if s =~ /\[(\d*)\]/ then "-#{$1}-" else s end }
 end
 
+def xpath_to_methodname(xpath)
+  xpath.gsub("/", "_").gsub(/\[\d*\]/) {|s| if s =~ /\[(\d*)\]/ then "_#{$1}_" else s end }
+end
+
 def generate_equality_test_data(progress, message, output_dir, config, options)
   unless Dir.exist?(output_dir)
     FileUtils.mkdir_p(output_dir)
@@ -1125,18 +1142,40 @@ def generate_equality_test(message, output_filename)
 
   base_filename = BASE_FILENAME
   positive_tests = []
-  positive_tests << "assert(equality('#{base_filename}', '#{base_filename}'), 'Equality implementation is not reflexive on file #{base_filename}')"
+  positive_tests << <<EOF
+  def test_equality_positive_base()
+    assert(equality('#{base_filename}', '#{base_filename}'), 'Equality implementation is not reflexive on file #{base_filename}')
+  end
+EOF
   each_structure_and_field_in(message) do |desc, xpath|
     if desc[:type] == :field then
-      positive_tests << "assert(equality('doc-mutated-#{xpath_to_filename(xpath)}.xml', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-mutated-#{xpath_to_filename(xpath)}.xml')"
+      positive_tests << <<EOF
+  def test_equality_positive_mutated_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-mutated-#{xpath_to_filename(xpath)}.xml', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-mutated-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
+
       if desc[:optional] == true then
-        positive_tests << "assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')"
+        positive_tests << <<EOF
+  def test_equality_positive_removed_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
       end
     elsif desc[:type] == :list then
       if desc[:element] then
-        positive_tests << "assert(equality('doc-mutated-#{xpath_to_filename(xpath)}.xml', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-mutated-#{xpath_to_filename(xpath)}.xml')"
+        positive_tests << <<EOF
+  def test_equality_positive_mutated_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-mutated-#{xpath_to_filename(xpath)}.xml', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-mutated-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
+
       else
-        positive_tests << "assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')"
+        positive_tests << <<EOF
+  def test_equality_positive_removed_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
       end
     elsif desc[:type] == :objlist then
       if desc[:element] then
@@ -1144,11 +1183,19 @@ def generate_equality_test(message, output_filename)
         # no additional test data neccessary as the element objects will contain fields that are modified already
       else
         # the list itself
-        positive_tests << "assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')"
+        positive_tests << <<EOF
+  def test_equality_positive_removed_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
       end
     elsif desc[:type] == :structure then
       if desc[:optional] == true then
-        positive_tests << "assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')"
+        positive_tests << <<EOF
+  def test_equality_positive_removed_#{xpath_to_methodname(xpath)}()
+    assert(equality('doc-removed-#{xpath_to_filename(xpath)}.xml', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation is not reflexive on file doc-removed-#{xpath_to_filename(xpath)}.xml')
+  end
+EOF
       end
     else
       raise RuntimeError.new("encountered unknown :type #{desc[:type].inspect}")
@@ -1158,15 +1205,33 @@ def generate_equality_test(message, output_filename)
   negative_tests = []
   each_structure_and_field_in(message) do |desc, xpath|
     if desc[:type] == :field then
-      negative_tests << "assert(!equality('#{base_filename}', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the field #{xpath} into account. It regards the files #{base_filename} and doc-mutated-#{xpath_to_filename(xpath)}.xml as equal.')"
+      negative_tests << <<EOF
+  def test_equality_negative_mutated_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the field #{xpath} into account. It regards the files #{base_filename} and doc-mutated-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
+      
       if desc[:optional] == true then
-        negative_tests << "assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of field #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')"
+        negative_tests << <<EOF
+  def test_equality_negative_removed_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of field #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
       end
     elsif desc[:type] == :list then
       if desc[:element] then
-        negative_tests << "assert(!equality('#{base_filename}', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the list #{xpath} into account. It regards the files #{base_filename} and doc-mutated-#{xpath_to_filename(xpath)}.xml as equal.')"
+        negative_tests << <<EOF
+  def test_equality_negative_mutated_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-mutated-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the list #{xpath} into account. It regards the files #{base_filename} and doc-mutated-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
+        
       else
-        negative_tests << "assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of the list #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')"
+        negative_tests << <<EOF
+  def test_equality_negative_removed_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of the list #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
       end
     elsif desc[:type] == :objlist then
       if desc[:element] then
@@ -1174,11 +1239,19 @@ def generate_equality_test(message, output_filename)
         # no additional test data neccessary as the element objects will contain fields that are modified already
       else
         # the list itself
-        negative_tests << "assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of objlist #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')"
+        negative_tests << <<EOF
+  def test_equality_negative_removed_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of objlist #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
       end
     elsif desc[:type] == :structure then
       if desc[:optional] == true then
-        negative_tests << "assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of structure #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')"
+        negative_tests << <<EOF
+  def test_equality_negative_removed_#{xpath_to_methodname(xpath)}()
+    assert(!equality('#{base_filename}', 'doc-removed-#{xpath_to_filename(xpath)}.xml'), 'Equality implementation seems not to take the existence of structure #{xpath} into account. It regards the files #{base_filename} and doc-removed-#{xpath_to_filename(xpath)}.xml as equal.')
+  end
+EOF
       end
     else
       raise RuntimeError.new("encountered unknown :type #{desc[:type].inspect}")
@@ -1199,13 +1272,9 @@ class EqualityTest < Test::Unit::TestCase
     system("diff", filename1, filename2)
   end
 
-  def test_equality_positive
-    #{positive_tests.join("\n    ")}
-  end
+#{positive_tests.join("\n\n")}
   
-  def test_equality_negative
-    #{negative_tests.join("\n    ")}
-  end
+#{negative_tests.join("\n\n")}
 end
 EOF
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbt-gen
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - FM-enthusiast
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-03 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri