use Assert command style and fix CI workflow

- switch tests to Assert Equals/Match command style
- add .themisrc for command helper setup
- use rhysd/action-setup-vim@v1 with stable/nightly
- test on ubuntu, macos, windows

Author: mattn

.github/workflows/test.yml

@@ -1,20 +1,31 @@
 name: Test
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 jobs:
   test:
-    runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        vim:
-          - v9.1.0
-          - nightly
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        version: [stable, nightly]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Vim
-        uses: thinca/action-setup-vim@v2
+      - id: vim
+        uses: rhysd/action-setup-vim@v1
         with:
-          vim_version: ${{ matrix.vim }}
-      - name: Clone vim-themis
-        run: git clone --depth 1 https://github.com/thinca/vim-themis.git ../vim-themis
+          version: ${{ matrix.version }}
+      - name: Setup vim-themis
+        uses: actions/checkout@v4
+        with:
+          repository: thinca/vim-themis
+          path: vim-themis
       - name: Run tests
-        run: ../vim-themis/bin/themis test/
+        env:
+          THEMIS_VIM: ${{ steps.vim.outputs.executable }}
+        run: ./vim-themis/bin/themis ./test

test/.themisrc

@@ -0,0 +1,3 @@
+set encoding=utf-8
+set rtp+=.
+call themis#helper('command').with(themis#helper('assert'))

test/base64.vimspec

@@ -1,35 +1,33 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#base64#b64encode
   It encodes string without padding
-    call s:assert.equals(webapi#base64#b64encode("hello, world"), "aGVsbG8sIHdvcmxk")
+    Assert Equals(webapi#base64#b64encode("hello, world"), "aGVsbG8sIHdvcmxk")
   End
 
   It encodes string with double padding
-    call s:assert.equals(webapi#base64#b64encode("hello, worldx"), "aGVsbG8sIHdvcmxkeA==")
+    Assert Equals(webapi#base64#b64encode("hello, worldx"), "aGVsbG8sIHdvcmxkeA==")
   End
 
   It encodes string with single padding
-    call s:assert.equals(webapi#base64#b64encode("hello, worldxx"), "aGVsbG8sIHdvcmxkeHg=")
+    Assert Equals(webapi#base64#b64encode("hello, worldxx"), "aGVsbG8sIHdvcmxkeHg=")
   End
 
   It encodes string aligned to 3 bytes
-    call s:assert.equals(webapi#base64#b64encode("hello, worldxxx"), "aGVsbG8sIHdvcmxkeHh4")
+    Assert Equals(webapi#base64#b64encode("hello, worldxxx"), "aGVsbG8sIHdvcmxkeHh4")
   End
 
   It encodes empty string
-    call s:assert.equals(webapi#base64#b64encode(""), "")
+    Assert Equals(webapi#base64#b64encode(""), "")
   End
 End
 
 Describe webapi#base64#b64decode
   It decodes string without padding
-    call s:assert.equals(webapi#base64#b64decode("aGVsbG8sIHdvcmxk"), "hello, world")
+    Assert Equals(webapi#base64#b64decode("aGVsbG8sIHdvcmxk"), "hello, world")
   End
 
   It round-trips strings
     for s in ["hello", "hello, world", "hello, worldx", "hello, worldxx", "hello, worldxxx"]
-      call s:assert.equals(webapi#base64#b64decode(webapi#base64#b64encode(s)), s)
+      Assert Equals(webapi#base64#b64decode(webapi#base64#b64encode(s)), s)
     endfor
   End
 End

test/bit.vimspec

@@ -1,52 +1,50 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#bit#dec2bin
   It converts decimal to binary string
-    call s:assert.equals(webapi#bit#dec2bin(0), 0)
-    call s:assert.equals(webapi#bit#dec2bin(1), '1')
-    call s:assert.equals(webapi#bit#dec2bin(5), '101')
-    call s:assert.equals(webapi#bit#dec2bin(255), '11111111')
+    Assert Equals(webapi#bit#dec2bin(0), 0)
+    Assert Equals(webapi#bit#dec2bin(1), '1')
+    Assert Equals(webapi#bit#dec2bin(5), '101')
+    Assert Equals(webapi#bit#dec2bin(255), '11111111')
   End
 End
 
 Describe webapi#bit#bin2dec
   It converts binary string to decimal
-    call s:assert.equals(webapi#bit#bin2dec(''), 0)
-    call s:assert.equals(webapi#bit#bin2dec('1'), 1)
-    call s:assert.equals(webapi#bit#bin2dec('101'), 5)
-    call s:assert.equals(webapi#bit#bin2dec('11111111'), 255)
+    Assert Equals(webapi#bit#bin2dec(''), 0)
+    Assert Equals(webapi#bit#bin2dec('1'), 1)
+    Assert Equals(webapi#bit#bin2dec('101'), 5)
+    Assert Equals(webapi#bit#bin2dec('11111111'), 255)
   End
 End
 
 Describe webapi#bit#or
   It computes bitwise OR
-    call s:assert.equals(webapi#bit#or(0x0F, 0xF0), 0xFF)
-    call s:assert.equals(webapi#bit#or(0, 0), 0)
+    Assert Equals(webapi#bit#or(0x0F, 0xF0), 0xFF)
+    Assert Equals(webapi#bit#or(0, 0), 0)
   End
 End
 
 Describe webapi#bit#and
   It computes bitwise AND
-    call s:assert.equals(webapi#bit#and(0xFF, 0x0F), 0x0F)
-    call s:assert.equals(webapi#bit#and(0xFF, 0), 0)
+    Assert Equals(webapi#bit#and(0xFF, 0x0F), 0x0F)
+    Assert Equals(webapi#bit#and(0xFF, 0), 0)
   End
 End
 
 Describe webapi#bit#xor
   It computes bitwise XOR
-    call s:assert.equals(webapi#bit#xor(0xFF, 0x0F), 0xF0)
-    call s:assert.equals(webapi#bit#xor(0xFF, 0xFF), 0)
+    Assert Equals(webapi#bit#xor(0xFF, 0x0F), 0xF0)
+    Assert Equals(webapi#bit#xor(0xFF, 0xFF), 0)
   End
 End
 
 Describe webapi#bit#shift
   It shifts left
-    call s:assert.equals(webapi#bit#shift(1, 4), 16)
-    call s:assert.equals(webapi#bit#shift(1, 8), 256)
+    Assert Equals(webapi#bit#shift(1, 4), 16)
+    Assert Equals(webapi#bit#shift(1, 8), 256)
   End
 
   It shifts right
-    call s:assert.equals(webapi#bit#shift(256, -4), 16)
-    call s:assert.equals(webapi#bit#shift(256, -8), 1)
+    Assert Equals(webapi#bit#shift(256, -4), 16)
+    Assert Equals(webapi#bit#shift(256, -8), 1)
   End
 End

test/hmac.vimspec

@@ -1,11 +1,9 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#hmac#sha1
   It computes HMAC-SHA1 (RFC 2202 test case 1)
-    call s:assert.equals(webapi#hmac#sha1(repeat("\x0b", 20), "Hi There"), "b617318655057264e28bc0b6fb378c8ef146be00")
+    Assert Equals(webapi#hmac#sha1(repeat("\x0b", 20), "Hi There"), "b617318655057264e28bc0b6fb378c8ef146be00")
   End
 
   It computes HMAC-SHA1 (RFC 2202 test case 2)
-    call s:assert.equals(webapi#hmac#sha1("Jefe", "what do ya want for nothing?"), "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79")
+    Assert Equals(webapi#hmac#sha1("Jefe", "what do ya want for nothing?"), "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79")
   End
 End

test/html.vimspec

@@ -1,35 +1,33 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#html#encodeEntityReference
   It encodes newline as LF not CR
-    call s:assert.equals(webapi#html#encodeEntityReference("\n"), '
')
+    Assert Equals(webapi#html#encodeEntityReference("\n"), '
')
   End
 
   It encodes ampersand
-    call s:assert.equals(webapi#html#encodeEntityReference('&'), '&')
+    Assert Equals(webapi#html#encodeEntityReference('&'), '&')
   End
 
   It encodes angle brackets
-    call s:assert.equals(webapi#html#encodeEntityReference('<'), '&lt;')
-    call s:assert.equals(webapi#html#encodeEntityReference('>'), '&gt;')
+    Assert Equals(webapi#html#encodeEntityReference('<'), '&lt;')
+    Assert Equals(webapi#html#encodeEntityReference('>'), '&gt;')
   End
 
   It encodes quotes
-    call s:assert.equals(webapi#html#encodeEntityReference('"'), '&quot;')
-    call s:assert.equals(webapi#html#encodeEntityReference("'"), '&apos;')
+    Assert Equals(webapi#html#encodeEntityReference('"'), '&quot;')
+    Assert Equals(webapi#html#encodeEntityReference("'"), '&apos;')
   End
 
   It encodes space as nbsp
-    call s:assert.equals(webapi#html#encodeEntityReference(' '), '&nbsp;')
+    Assert Equals(webapi#html#encodeEntityReference(' '), '&nbsp;')
   End
 End
 
 Describe webapi#html#decodeEntityReference
   It decodes basic entities
-    call s:assert.equals(webapi#html#decodeEntityReference('&amp;'), '&')
-    call s:assert.equals(webapi#html#decodeEntityReference('&lt;'), '<')
-    call s:assert.equals(webapi#html#decodeEntityReference('&gt;'), '>')
-    call s:assert.equals(webapi#html#decodeEntityReference('&quot;'), '"')
-    call s:assert.equals(webapi#html#decodeEntityReference('&apos;'), "'")
+    Assert Equals(webapi#html#decodeEntityReference('&amp;'), '&')
+    Assert Equals(webapi#html#decodeEntityReference('&lt;'), '<')
+    Assert Equals(webapi#html#decodeEntityReference('&gt;'), '>')
+    Assert Equals(webapi#html#decodeEntityReference('&quot;'), '"')
+    Assert Equals(webapi#html#decodeEntityReference('&apos;'), "'")
   End
 End

test/http.vimspec

@@ -1,56 +1,54 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#http#encodeURI
   It encodes special characters
-    call s:assert.equals(webapi#http#encodeURI("hello world"), "hello%20world")
-    call s:assert.equals(webapi#http#encodeURI("a&b=c"), "a%26b%3Dc")
+    Assert Equals(webapi#http#encodeURI("hello world"), "hello%20world")
+    Assert Equals(webapi#http#encodeURI("a&b=c"), "a%26b%3Dc")
   End
 
   It preserves unreserved characters
-    call s:assert.equals(webapi#http#encodeURI("abc123"), "abc123")
-    call s:assert.equals(webapi#http#encodeURI("a.b-c_d"), "a.b-c_d")
+    Assert Equals(webapi#http#encodeURI("abc123"), "abc123")
+    Assert Equals(webapi#http#encodeURI("a.b-c_d"), "a.b-c_d")
   End
 
   It encodes dict as query string
-    call s:assert.equals(webapi#http#encodeURI({'a': '1', 'b': '2'}), "a=1&b=2")
+    Assert Equals(webapi#http#encodeURI({'a': '1', 'b': '2'}), "a=1&b=2")
   End
 End
 
 Describe webapi#http#encodeURIComponent
   It encodes special characters
-    call s:assert.equals(webapi#http#encodeURIComponent("a&b"), "a%26b")
+    Assert Equals(webapi#http#encodeURIComponent("a&b"), "a%26b")
   End
 
   It preserves unreserved characters
-    call s:assert.equals(webapi#http#encodeURIComponent("abc"), "abc")
+    Assert Equals(webapi#http#encodeURIComponent("abc"), "abc")
   End
 
   It encodes space as plus
-    call s:assert.equals(webapi#http#encodeURIComponent("a b"), "a+b")
+    Assert Equals(webapi#http#encodeURIComponent("a b"), "a+b")
   End
 
   It encodes dict as query string
-    call s:assert.equals(webapi#http#encodeURIComponent({'a': '1', 'b': '2'}), "a=1&b=2")
+    Assert Equals(webapi#http#encodeURIComponent({'a': '1', 'b': '2'}), "a=1&b=2")
   End
 End
 
 Describe webapi#http#decodeURI
   It decodes percent-encoded characters
-    call s:assert.equals(webapi#http#decodeURI("hello%20world"), "hello world")
-    call s:assert.equals(webapi#http#decodeURI("a%26b"), "a&b")
+    Assert Equals(webapi#http#decodeURI("hello%20world"), "hello world")
+    Assert Equals(webapi#http#decodeURI("a%26b"), "a&b")
   End
 
   It decodes plus as space
-    call s:assert.equals(webapi#http#decodeURI("a+b"), "a b")
+    Assert Equals(webapi#http#decodeURI("a+b"), "a b")
   End
 End
 
 Describe webapi#http#escape
   It encodes special characters
-    call s:assert.equals(webapi#http#escape("hello world"), "hello%20world")
+    Assert Equals(webapi#http#escape("hello world"), "hello%20world")
   End
 
   It preserves safe characters
-    call s:assert.equals(webapi#http#escape("a.b-c_d/e"), "a.b-c_d/e")
+    Assert Equals(webapi#http#escape("a.b-c_d/e"), "a.b-c_d/e")
   End
 End

test/json.vimspec

@@ -1,72 +1,70 @@
-let s:assert = themis#helper('assert')
-
 Describe webapi#json#encode
   It encodes control characters as hex
-    call s:assert.match(webapi#json#encode("\x01"), '".*01.*"')
-    call s:assert.match(webapi#json#encode("\x0b"), '".*0b.*"')
-    call s:assert.match(webapi#json#encode("\x1f"), '".*1f.*"')
+    Assert Match(webapi#json#encode("\x01"), '".*01.*"')
+    Assert Match(webapi#json#encode("\x0b"), '".*0b.*"')
+    Assert Match(webapi#json#encode("\x1f"), '".*1f.*"')
   End
 
   It encodes tab, cr, lf with escape sequences
-    call s:assert.equals(webapi#json#encode("\t"), '"\t"')
-    call s:assert.equals(webapi#json#encode("\r"), '"\r"')
-    call s:assert.equals(webapi#json#encode("\n"), '"\n"')
+    Assert Equals(webapi#json#encode("\t"), '"\t"')
+    Assert Equals(webapi#json#encode("\r"), '"\r"')
+    Assert Equals(webapi#json#encode("\n"), '"\n"')
   End
 
   It encodes strings
-    call s:assert.equals(webapi#json#encode("hello"), '"hello"')
+    Assert Equals(webapi#json#encode("hello"), '"hello"')
   End
 
   It encodes numbers
-    call s:assert.equals(webapi#json#encode(42), 42)
+    Assert Equals(webapi#json#encode(42), 42)
   End
 
   It encodes lists
-    call s:assert.equals(webapi#json#encode([1, 2, 3]), '[1,2,3]')
+    Assert Equals(webapi#json#encode([1, 2, 3]), '[1,2,3]')
   End
 
   It encodes dicts
-    call s:assert.equals(webapi#json#encode({'a': 1}), '{"a":1}')
+    Assert Equals(webapi#json#encode({'a': 1}), '{"a":1}')
   End
 
   It encodes null, true, false
-    call s:assert.equals(webapi#json#encode(function('webapi#json#null')), 'null')
-    call s:assert.equals(webapi#json#encode(function('webapi#json#true')), 'true')
-    call s:assert.equals(webapi#json#encode(function('webapi#json#false')), 'false')
+    Assert Equals(webapi#json#encode(function('webapi#json#null')), 'null')
+    Assert Equals(webapi#json#encode(function('webapi#json#true')), 'true')
+    Assert Equals(webapi#json#encode(function('webapi#json#false')), 'false')
   End
 End
 
 Describe webapi#json#decode
   It decodes strings
-    call s:assert.equals(webapi#json#decode('"hello"'), 'hello')
+    Assert Equals(webapi#json#decode('"hello"'), 'hello')
   End
 
   It decodes numbers
-    call s:assert.equals(webapi#json#decode('42'), 42)
+    Assert Equals(webapi#json#decode('42'), 42)
   End
 
   It decodes lists
-    call s:assert.equals(webapi#json#decode('[1,2,3]'), [1, 2, 3])
+    Assert Equals(webapi#json#decode('[1,2,3]'), [1, 2, 3])
   End
 
   It decodes dicts
-    call s:assert.equals(webapi#json#decode('{"a":1}'), {'a': 1})
+    Assert Equals(webapi#json#decode('{"a":1}'), {'a': 1})
   End
 
   It decodes nested structures
-    call s:assert.equals(webapi#json#decode('{"a":[1,2]}'), {'a': [1, 2]})
+    Assert Equals(webapi#json#decode('{"a":[1,2]}'), {'a': [1, 2]})
   End
 
   It decodes true and false
-    call s:assert.equals(webapi#json#decode('true'), 1)
-    call s:assert.equals(webapi#json#decode('false'), 0)
+    Assert Equals(webapi#json#decode('true'), 1)
+    Assert Equals(webapi#json#decode('false'), 0)
   End
 
   It decodes null
-    call s:assert.equals(webapi#json#decode('null'), 0)
+    Assert Equals(webapi#json#decode('null'), 0)
   End
 
   It decodes unicode escapes
-    call s:assert.equals(webapi#json#decode('"hello\u0020world"'), 'hello world')
+    Assert Equals(webapi#json#decode('"hello\u0020world"'), 'hello world')
   End
 End