factbase 0.4.0 → 0.5.0

data/test/factbase/test_inv.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -28,7 +28,7 @@ require_relative '../../lib/factbase/pre'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestInv < Minitest::Test
   def test_simple_checking
@@ -38,7 +38,7 @@ class TestInv < Minitest::Test
       end
     f = fb.insert
     f.a = 42
-    assert_raises do
+    assert_raises(StandardError) do
       f.b = 'here we should crash'
     end
     f.c = 256

data/test/factbase/test_looged.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative '../../lib/factbase/looged'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestLooged < Minitest::Test
   def test_simple_setting
@@ -36,7 +36,7 @@ class TestLooged < Minitest::Test
     fb.insert.bar = 3
     found = 0
     fb.query('(exists bar)').each do |f|
-      assert(42, f.bar.positive?)
+      assert_predicate(f.bar, :positive?)
       f.foo = 42
       assert_equal(42, f.foo)
       found += 1
@@ -62,32 +62,32 @@ class TestLooged < Minitest::Test
       end
     )
     assert_equal(1, fb.size)
-    assert(log.to_s.include?('modified'), log)
+    assert_includes(log.to_s, 'modified', log)
   end
 
   def test_with_txn_rollback
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
-    assert(!fb.txn { raise Factbase::Rollback })
+    refute(fb.txn { raise Factbase::Rollback })
     assert_equal(0, fb.size)
-    assert(log.to_s.include?('rolled back'), log)
-    assert(!log.to_s.include?('didn\'t touch'), log)
+    assert_includes(log.to_s, 'rolled back', log)
+    refute_includes(log.to_s, 'didn\'t touch', log)
   end
 
   def test_with_modifying_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
     fb.insert.foo = 1
-    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a }, log)
-    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 }, log)
-    assert(log.to_s.include?('modified'), log)
+    refute(fb.txn { |fbt| fbt.query('(always)').each.to_a }, log)
+    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 })
+    assert_includes(log.to_s, 'modified', log)
   end
 
   def test_with_empty_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)
-    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a })
-    assert(log.to_s.include?('didn\'t touch'), log)
+    refute(fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert_includes(log.to_s, 'didn\'t touch', log)
   end
 
   def test_returns_int
@@ -140,7 +140,7 @@ class TestLooged < Minitest::Test
       'Found 1 fact(s) by \'(exists bar)\'',
       'Deleted 3 fact(s) out of 4 by \'(not (exists bar))\''
     ].each do |s|
-      assert(log.to_s.include?(s), "#{log}\n")
+      assert_includes(log.to_s, s, "#{log}\n")
     end
   end
 end

data/test/factbase/test_pre.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@ require_relative '../../lib/factbase/pre'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestPre < Minitest::Test
   def test_simple_setting

data/test/factbase/test_query.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,13 +27,13 @@ require_relative '../../lib/factbase/query'
 
 # Query test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestQuery < Minitest::Test
   def test_simple_parsing
     maps = []
     maps << { 'foo' => [42] }
-    q = Factbase::Query.new(maps, Mutex.new, '(eq foo 42)')
+    q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo 42)')
     assert_equal(
       1,
       q.each do |f|
@@ -88,7 +88,7 @@ class TestQuery < Minitest::Test
       "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1,
       '(eq 3 (agg (eq num $num) (count)))' => 1
     }.each do |q, r|
-      assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)
+      assert_equal(r, Factbase::Query.new(Factbase.new, maps, Mutex.new, q).each.to_a.size, q)
     end
   end
 
@@ -96,7 +96,7 @@ class TestQuery < Minitest::Test
     maps = []
     now = Time.now.utc
     maps << { 'foo' => [now] }
-    q = Factbase::Query.new(maps, Mutex.new, "(eq foo #{now.iso8601})")
+    q = Factbase::Query.new(Factbase.new, maps, Mutex.new, "(eq foo #{now.iso8601})")
     assert_equal(1, q.each.to_a.size)
   end
 
@@ -105,7 +105,7 @@ class TestQuery < Minitest::Test
     maps << { 'foo' => [42] }
     maps << { 'bar' => [4, 5] }
     maps << { 'bar' => [5] }
-    q = Factbase::Query.new(maps, Mutex.new, '(eq bar 5)')
+    q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq bar 5)')
     assert_equal(2, q.delete!)
     assert_equal(1, maps.size)
   end
@@ -121,7 +121,7 @@ class TestQuery < Minitest::Test
       '(agg (eq bar $v) (count))' => 1,
       '(agg (eq z 40) (count))' => 0
     }.each do |q, expected|
-      result = Factbase::Query.new(maps, Mutex.new, q).one(v: 4)
+      result = Factbase::Query.new(Factbase.new, maps, Mutex.new, q).one(v: 4)
       if expected.nil?
         assert_nil(result, "#{q} -> nil")
       else
@@ -135,7 +135,7 @@ class TestQuery < Minitest::Test
     maps << { 'foo' => [42] }
     maps << { 'bar' => [4, 5] }
     maps << { 'bar' => [5] }
-    q = Factbase::Query.new(maps, Mutex.new, '(never)')
+    q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(never)')
     assert_equal(0, q.delete!)
     assert_equal(3, maps.size)
   end
@@ -143,20 +143,20 @@ class TestQuery < Minitest::Test
   def test_to_array
     maps = []
     maps << { 'foo' => [42] }
-    assert_equal(1, Factbase::Query.new(maps, Mutex.new, '(eq foo 42)').each.to_a.size)
+    assert_equal(1, Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo 42)').each.to_a.size)
   end
 
   def test_returns_int
     maps = []
     maps << { 'foo' => [1] }
-    q = Factbase::Query.new(maps, Mutex.new, '(eq foo 1)')
+    q = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo 1)')
     assert_equal(1, q.each(&:to_s))
   end
 
   def test_with_aliases
     maps = []
     maps << { 'foo' => [42] }
-    assert_equal(45, Factbase::Query.new(maps, Mutex.new, '(as bar (plus foo 3))').each.to_a[0].bar)
+    assert_equal(45, Factbase::Query.new(Factbase.new, maps, Mutex.new, '(as bar (plus foo 3))').each.to_a[0].bar)
     assert_equal(1, maps[0].size)
   end
 
@@ -165,24 +165,24 @@ class TestQuery < Minitest::Test
     maps << { 'foo' => [42] }
     maps << { 'foo' => [17] }
     found = 0
-    Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: [42]) do
+    Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo $bar)').each(bar: [42]) do
       found += 1
     end
     assert_equal(1, found)
-    assert_equal(1, Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: 42).to_a.size)
-    assert_equal(0, Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: 555).to_a.size)
+    assert_equal(1, Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo $bar)').each(bar: 42).to_a.size)
+    assert_equal(0, Factbase::Query.new(Factbase.new, maps, Mutex.new, '(eq foo $bar)').each(bar: 555).to_a.size)
   end
 
   def test_with_nil_alias
     maps = []
     maps << { 'foo' => [42] }
-    assert(Factbase::Query.new(maps, Mutex.new, '(as bar (plus xxx 3))').each.to_a[0]['bar'].nil?)
+    assert_nil(Factbase::Query.new(Factbase.new, maps, Mutex.new, '(as bar (plus xxx 3))').each.to_a[0]['bar'])
   end
 
   def test_get_all_properties
     maps = []
     maps << { 'foo' => [42] }
-    f = Factbase::Query.new(maps, Mutex.new, '(always)').each.to_a[0]
-    assert(f.all_properties.include?('foo'))
+    f = Factbase::Query.new(Factbase.new, maps, Mutex.new, '(always)').each.to_a[0]
+    assert_includes(f.all_properties, 'foo')
   end
 end

data/test/factbase/test_rules.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative '../../lib/factbase/pre'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestRules < Minitest::Test
   def test_simple_checking
@@ -38,8 +38,8 @@ class TestRules < Minitest::Test
     f1 = fb.insert
     f1.second = 2
     f1.first = 1
-    assert_raises do
-      f2 = fb.insert
+    f2 = fb.insert
+    assert_raises(StandardError) do
       f2.first = 1
     end
   end
@@ -60,7 +60,7 @@ class TestRules < Minitest::Test
     f = fb.insert
     f.foo = 42
     s = f.to_s
-    assert(s.length.positive?, s)
+    assert_predicate(s.length, :positive?, s)
     assert_equal('[ foo: [42] ]', s)
   end
 
@@ -74,7 +74,7 @@ class TestRules < Minitest::Test
   def test_check_only_when_txn_is_closed
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
     ok = false
-    assert_raises do
+    assert_raises(StandardError) do
       fb.txn do |fbt|
         f = fbt.insert
         f.a = 1
@@ -87,7 +87,7 @@ class TestRules < Minitest::Test
 
   def test_rollback_on_violation
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
-    assert_raises do
+    assert_raises(StandardError) do
       fb.txn do |fbt|
         f = fbt.insert
         f.a = 1
@@ -104,7 +104,7 @@ class TestRules < Minitest::Test
         f.hello = 42
       end
     ok = false
-    assert_raises do
+    assert_raises(StandardError) do
       fb.txn do |fbt|
         f = fbt.insert
         f.a = 1

data/test/factbase/test_syntax.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../lib/factbase/syntax'
 
 # Syntax test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestSyntax < Minitest::Test
   def test_parses_string_right
@@ -35,7 +35,27 @@ class TestSyntax < Minitest::Test
       "(foo 'one two three   ')",
       "(foo 'one two three   ' 'tail tail')"
     ].each do |q|
-      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s, q)
+      assert_equal(q, Factbase::Syntax.new(Factbase.new, q).to_term.to_s, q)
+    end
+  end
+
+  def test_makes_abstract_terms
+    {
+      '(foo $bar)' => true,
+      '(foo (bar (a (b c (f $bar)))))' => true,
+      '(foo (bar (a (b c (f bar)))))' => false
+    }.each do |q, a|
+      assert_equal(a, Factbase::Syntax.new(Factbase.new, q).to_term.abstract?)
+    end
+  end
+
+  def test_makes_static_terms
+    {
+      '(foo bar)' => false,
+      '(foo "bar")' => true,
+      '(agg (always) (max id))' => true
+    }.each do |q, a|
+      assert_equal(a, Factbase::Syntax.new(Factbase.new, q).to_term.static?)
     end
   end
 
@@ -50,7 +70,7 @@ class TestSyntax < Minitest::Test
       "(foo 'Hello,\n\nworld!\r\t\n')\n",
       "(or ( a 4) (b 5) (always) (and (always) (c 5) \t\t(r 7 w8s w8is 'Foo')))"
     ].each do |q|
-      assert(!Factbase::Syntax.new(q).to_term.nil?)
+      refute_nil(Factbase::Syntax.new(Factbase.new, q).to_term)
     end
   end
 
@@ -70,7 +90,7 @@ class TestSyntax < Minitest::Test
       '(eq t 3.0e+21)',
       "(foo (x (f (t (y 42 'Hey you'))) (never) (r 3)) y z)"
     ].each do |q|
-      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s, q)
+      assert_equal(q, Factbase::Syntax.new(Factbase.new, q).to_term.to_s, q)
     end
   end
 
@@ -85,7 +105,7 @@ class TestSyntax < Minitest::Test
       '(or (eq bar 888) (eq z 1))' => true,
       "(or (gt bar 100) (eq foo 'Hello, world!'))" => true
     }.each do |k, v|
-      assert_equal(v, Factbase::Syntax.new(k).to_term.evaluate(m, []), k)
+      assert_equal(v, Factbase::Syntax.new(Factbase.new, k).to_term.evaluate(m, []), k)
     end
   end
 
@@ -109,9 +129,9 @@ class TestSyntax < Minitest::Test
       '"'
     ].each do |q|
       msg = assert_raises(q) do
-        Factbase::Syntax.new(q).to_term
+        Factbase::Syntax.new(Factbase.new, q).to_term
       end.message
-      assert(msg.include?(q), msg)
+      assert_includes(msg, q, msg)
     end
   end
 
@@ -121,7 +141,7 @@ class TestSyntax < Minitest::Test
       '(and (foo) (foo))' => '(foo)',
       '(and (foo) (or (and (eq a 1))) (eq a 1) (foo))' => '(and (foo) (eq a 1))'
     }.each do |s, t|
-      assert_equal(t, Factbase::Syntax.new(s).to_term.to_s)
+      assert_equal(t, Factbase::Syntax.new(Factbase.new, s).to_term.to_s)
     end
   end
 end

data/test/factbase/test_tee.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,13 +27,13 @@ require_relative '../../lib/factbase/fact'
 
 # Tee test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestTee < Minitest::Test
   def test_two_facts
-    prim = Factbase::Fact.new(Mutex.new, {})
+    prim = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     prim.foo = 42
-    upper = Factbase::Fact.new(Mutex.new, {})
+    upper = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     upper.bar = 13
     t = Factbase::Tee.new(prim, upper)
     assert_equal(42, t.foo)
@@ -41,18 +41,18 @@ class TestTee < Minitest::Test
   end
 
   def test_all_properties
-    prim = Factbase::Fact.new(Mutex.new, {})
+    prim = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     prim.foo = 42
-    upper = Factbase::Fact.new(Mutex.new, {})
+    upper = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     upper.bar = 13
     t = Factbase::Tee.new(prim, upper)
-    assert(t.all_properties.include?('foo'))
-    assert(t.all_properties.include?('bar'))
+    assert_includes(t.all_properties, 'foo')
+    assert_includes(t.all_properties, 'bar')
   end
 
   def test_recursively
     map = {}
-    prim = Factbase::Fact.new(Mutex.new, map)
+    prim = Factbase::Fact.new(Factbase.new, Mutex.new, map)
     prim.foo = 42
     t = Factbase::Tee.new(nil, { 'bar' => 7 })
     assert_equal(7, t['$bar'])
@@ -61,9 +61,9 @@ class TestTee < Minitest::Test
   end
 
   def test_prints_to_string
-    prim = Factbase::Fact.new(Mutex.new, {})
+    prim = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     prim.foo = 42
-    upper = Factbase::Fact.new(Mutex.new, {})
+    upper = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     upper.bar = 13
     t = Factbase::Tee.new(prim, upper)
     assert_equal('[ foo: [42] ]', t.to_s)

data/test/factbase/test_term.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,34 +25,34 @@ require_relative '../../lib/factbase/term'
 
 # Term test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestTerm < Minitest::Test
   def test_false_matching
-    t = Factbase::Term.new(:never, [])
-    assert(!t.evaluate(fact('foo' => [100]), []))
+    t = Factbase::Term.new(Factbase.new, :never, [])
+    refute(t.evaluate(fact('foo' => [100]), []))
   end
 
   def test_size_matching
-    t = Factbase::Term.new(:size, [:foo])
+    t = Factbase::Term.new(Factbase.new, :size, [:foo])
     assert_equal(3, t.evaluate(fact('foo' => [42, 12, -90]), []))
     assert_equal(0, t.evaluate(fact('bar' => 100), []))
   end
 
   def test_exists_matching
-    t = Factbase::Term.new(:exists, [:foo])
+    t = Factbase::Term.new(Factbase.new, :exists, [:foo])
     assert(t.evaluate(fact('foo' => [42, 12, -90]), []))
-    assert(!t.evaluate(fact('bar' => 100), []))
+    refute(t.evaluate(fact('bar' => 100), []))
   end
 
   def test_absent_matching
-    t = Factbase::Term.new(:absent, [:foo])
+    t = Factbase::Term.new(Factbase.new, :absent, [:foo])
     assert(t.evaluate(fact('z' => [42, 12, -90]), []))
-    assert(!t.evaluate(fact('foo' => 100), []))
+    refute(t.evaluate(fact('foo' => 100), []))
   end
 
   def test_type_matching
-    t = Factbase::Term.new(:type, [:foo])
+    t = Factbase::Term.new(Factbase.new, :type, [:foo])
     assert_equal('Integer', t.evaluate(fact('foo' => 42), []))
     assert_equal('Integer', t.evaluate(fact('foo' => [42]), []))
     assert_equal('Array', t.evaluate(fact('foo' => [1, 2, 3]), []))
@@ -64,30 +64,30 @@ class TestTerm < Minitest::Test
   end
 
   def test_past
-    t = Factbase::Term.new(:prev, [:foo])
+    t = Factbase::Term.new(Factbase.new, :prev, [:foo])
     assert_nil(t.evaluate(fact('foo' => 4), []))
     assert_equal([4], t.evaluate(fact('foo' => 5), []))
   end
 
   def test_at
-    t = Factbase::Term.new(:at, [1, :foo])
+    t = Factbase::Term.new(Factbase.new, :at, [1, :foo])
     assert_nil(t.evaluate(fact('foo' => 4), []))
     assert_equal(5, t.evaluate(fact('foo' => [4, 5]), []))
   end
 
   def test_report_missing_term
-    t = Factbase::Term.new(:something, [])
-    msg = assert_raises do
+    t = Factbase::Term.new(Factbase.new, :something, [])
+    msg = assert_raises(StandardError) do
       t.evaluate(fact, [])
     end.message
-    assert(msg.include?('not defined at (something)'), msg)
+    assert_includes(msg, 'not defined at (something)', msg)
   end
 
   def test_report_other_error
-    t = Factbase::Term.new(:at, [])
-    msg = assert_raises do
+    t = Factbase::Term.new(Factbase.new, :at, [])
+    msg = assert_raises(StandardError) do
       t.evaluate(fact, [])
     end.message
-    assert(msg.include?('at (at)'), msg)
+    assert_includes(msg, 'at (at)', msg)
   end
 end

data/test/factbase/test_to_json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative '../../lib/factbase/to_json'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestToJSON < Minitest::Test
   def test_simple_rendering
@@ -37,7 +37,7 @@ class TestToJSON < Minitest::Test
     f.foo = 256
     to = Factbase::ToJSON.new(fb)
     json = JSON.parse(to.json)
-    assert(42, json[0]['foo'][1])
+    assert_equal(256, json[0]['foo'][1])
   end
 
   def test_sort_keys
@@ -47,6 +47,6 @@ class TestToJSON < Minitest::Test
     f.b = 1
     f.a = 256
     json = Factbase::ToJSON.new(fb).json
-    assert(json.include?('{"a":256,"b":1,"c":42}'), json)
+    assert_includes(json, '{"a":256,"b":1,"c":42}', json)
   end
 end

data/test/factbase/test_to_xml.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative '../../lib/factbase/to_xml'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestToXML < Minitest::Test
   def test_simple_rendering
@@ -35,11 +35,9 @@ class TestToXML < Minitest::Test
     fb.insert.t = Time.now
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
-    assert(!xml.xpath('/fb/f[t]').empty?)
-    assert(
-      xml.xpath('/fb/f/t/text()').text.match?(
-        /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/
-      )
+    refute_empty(xml.xpath('/fb/f[t]'))
+    assert_match(
+      /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/, xml.xpath('/fb/f/t/text()').text
     )
   end
 
@@ -48,7 +46,7 @@ class TestToXML < Minitest::Test
     fb.insert.t = "\uffff < > & ' \""
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
-    assert(!xml.xpath('/fb/f[t]').empty?)
+    refute_empty(xml.xpath('/fb/f[t]'))
   end
 
   def test_meta_data_presence
@@ -56,8 +54,8 @@ class TestToXML < Minitest::Test
     fb.insert.x = 42
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
-    assert(!xml.xpath('/fb[@version]').empty?)
-    assert(!xml.xpath('/fb[@size]').empty?)
+    refute_empty(xml.xpath('/fb[@version]'))
+    refute_empty(xml.xpath('/fb[@size]'))
   end
 
   def test_to_xml_with_short_names
@@ -67,8 +65,8 @@ class TestToXML < Minitest::Test
     f.f = 2
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
-    assert(!xml.xpath('/fb/f/type').empty?)
-    assert(!xml.xpath('/fb/f/f').empty?)
+    refute_empty(xml.xpath('/fb/f/type'))
+    refute_empty(xml.xpath('/fb/f/f'))
   end
 
   def test_show_types_as_attributes
@@ -89,7 +87,7 @@ class TestToXML < Minitest::Test
       '/fb/f/d[@t="T"]',
       '/fb/f/e/v[@t="S"]',
       '/fb/f/e/v[@t="I"]'
-    ].each { |x| assert(!xml.xpath(x).empty?, out) }
+    ].each { |x| refute_empty(xml.xpath(x), out) }
   end
 
   def test_sorts_keys
@@ -102,7 +100,7 @@ class TestToXML < Minitest::Test
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
     %w[a c t x].each_with_index do |e, i|
-      assert(!xml.xpath("/fb/f/#{e}[count(preceding-sibling::*) = #{i}]").empty?, e)
+      refute_empty(xml.xpath("/fb/f/#{e}[count(preceding-sibling::*) = #{i}]"), e)
     end
   end
 end