m 1.4.0 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +15 -8
  3. data/Appraisals +2 -2
  4. data/Gemfile.lock +38 -51
  5. data/README.md +44 -27
  6. data/gemfiles/minitest4.gemfile +5 -3
  7. data/gemfiles/minitest4.gemfile.lock +39 -51
  8. data/gemfiles/minitest5.gemfile +5 -3
  9. data/gemfiles/minitest5.gemfile.lock +44 -46
  10. data/gemfiles/test_unit_gem.gemfile +4 -2
  11. data/gemfiles/test_unit_gem.gemfile.lock +44 -53
  12. data/lib/error_tests/error_test.rb +7 -0
  13. data/lib/m/executor.rb +3 -3
  14. data/lib/m/frameworks.rb +6 -2
  15. data/lib/m/parser.rb +29 -6
  16. data/lib/m/test_collection.rb +5 -6
  17. data/lib/m/test_method.rb +3 -1
  18. data/lib/m/testable.rb +8 -6
  19. data/lib/m/version.rb +3 -0
  20. data/lib/m.rb +1 -1
  21. data/test/active_support_test.rb +17 -17
  22. data/test/everything_test.rb +4 -4
  23. data/test/examples/active_support_example_test.rb +1 -0
  24. data/test/examples/active_support_unescaped_example_test.rb +1 -0
  25. data/test/examples/minitest_example_test.rb +36 -0
  26. data/test/examples/multiple_example_test.rb +1 -0
  27. data/test/examples/subdir/another_subdir/d_test.rb +7 -0
  28. data/test/examples/subdir/another_subdir/yet_another_subdir/e_test.rb +7 -0
  29. data/test/exit_codes_test.rb +33 -0
  30. data/test/multiple_test.rb +3 -3
  31. data/test/options_test.rb +38 -6
  32. data/test/test_helper.rb +5 -0
  33. metadata +16 -8
  34. data/lib/version.rb +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 9436a8da214c3991f21610d54d7f9a97e14835f7
4
- data.tar.gz: 0d67da2b4de31c4cc41b8796e9e0c41482f36cc8
2
+ SHA256:
3
+ metadata.gz: 02ef4d061c7ec25262a03a7f9fbf1735dac5de7900fb2b6c89875a0d3a2cf132
4
+ data.tar.gz: 47ccce99a3448307744eaa70fddf565efbbff22484016814a4ebb77e9c75ced7
5
5
  SHA512:
6
- metadata.gz: 21a7165beb196aec53eff14edff1334d9c065324825c69643a41ce1e71e22e1dd9f82fbbd27ad7c6c1a0c70c33ef5443e39b0a86fe0ae33edd8a116ad2659692
7
- data.tar.gz: 8ed90bc2beaa7b33002243af5938db5c25f3809962eb228a2d8e43c52e13ac1c43698d32986b5b34c2438b651d73c32eb5b0d9b9a14a09c94672c3205f5251e4
6
+ metadata.gz: 13b26f2e2d72629ca1a0ab7b1eeae409b872f53f71d03620e0ce7f6c60d975b5c7a8d6091003f3ec9c5604e3f7a270ab0df3bafc547036c8c7d4abfc26015c29
7
+ data.tar.gz: b3b74f7252d34d49abc46c4056a8224f50e8bf3a072393a0a33a8a5dbf3d2ff78c43f8035f28b76b34270339d4f9c4c923c567ecd4f6991cbe149ecddcd562ea
data/.travis.yml CHANGED
@@ -1,12 +1,19 @@
1
+ language: ruby
1
2
  rvm:
2
- - 2.0.0
3
- - 2.1.0
4
- - 2.2.0
5
- - jruby-1.7.21
3
+ - 2.4
4
+ - 2.5
5
+ - 2.6
6
+ - 2.7
7
+ - 3.0
8
+ - jruby-9.2
9
+ before_install:
10
+ - yes | gem update --system --force
11
+ - gem install bundler
12
+ gemfile:
13
+ - gemfiles/minitest4.gemfile
14
+ - gemfiles/minitest5.gemfile
15
+ - gemfiles/test_unit_gem.gemfile
6
16
  install:
7
17
  - bundle install
8
- - bundle --gemfile=gemfiles/minitest5.gemfile
9
- - bundle --gemfile=gemfiles/minitest4.gemfile
10
- - bundle --gemfile=gemfiles/test_unit_gem.gemfile
11
18
  script:
12
- - bundle exec rake tests
19
+ - bundle exec rake test
data/Appraisals CHANGED
@@ -1,9 +1,9 @@
1
1
  appraise "minitest4" do
2
- gem 'minitest', '4.7.5'
2
+ gem 'minitest', '~> 4'
3
3
  end
4
4
 
5
5
  appraise "minitest5" do
6
- gem 'minitest'
6
+ gem 'minitest', '~> 5'
7
7
  end
8
8
 
9
9
  appraise "test_unit_gem" do
data/Gemfile.lock CHANGED
@@ -1,72 +1,59 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- m (1.4.0)
4
+ m (1.6.0)
5
5
  method_source (>= 0.6.7)
6
6
  rake (>= 0.9.2.2)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- activesupport (4.0.13)
12
- i18n (~> 0.6, >= 0.6.9)
13
- minitest (~> 4.2)
14
- multi_json (~> 1.3)
15
- thread_safe (~> 0.1)
16
- tzinfo (~> 0.3.37)
11
+ activesupport (6.1.4.1)
12
+ concurrent-ruby (~> 1.0, >= 1.0.2)
13
+ i18n (>= 1.6, < 2)
14
+ minitest (>= 5.1)
15
+ tzinfo (~> 2.0)
16
+ zeitwerk (~> 2.3)
17
17
  allocation_stats (0.1.5)
18
- appraisal (2.0.1)
19
- activesupport (>= 3.2.21)
18
+ appraisal (2.4.1)
20
19
  bundler
21
20
  rake
22
21
  thor (>= 0.14.0)
23
- benchmark-ips (2.1.1)
24
- coveralls (0.8.1)
25
- json (~> 1.8)
26
- rest-client (>= 1.6.8, < 2)
27
- simplecov (~> 0.10.0)
22
+ benchmark-ips (2.9.1)
23
+ concurrent-ruby (1.1.9)
24
+ coveralls (0.8.23)
25
+ json (>= 1.8, < 3)
26
+ simplecov (~> 0.16.1)
28
27
  term-ansicolor (~> 1.3)
29
- thor (~> 0.19.1)
30
- docile (1.1.5)
31
- domain_name (0.5.24)
32
- unf (>= 0.0.5, < 1.0.0)
33
- http-cookie (1.0.2)
34
- domain_name (~> 0.5)
35
- i18n (0.7.0)
36
- json (1.8.2)
37
- json (1.8.2-java)
38
- method_source (0.8.2)
39
- mime-types (2.5)
40
- minitest (4.7.5)
41
- multi_json (1.11.0)
42
- mustache (1.0.2)
43
- netrc (0.10.3)
44
- rake (10.4.2)
45
- rdiscount (2.1.8)
46
- redcarpet (3.3.2)
47
- rest-client (1.8.0)
48
- http-cookie (>= 1.0.2, < 2.0)
49
- mime-types (>= 1.16, < 3.0)
50
- netrc (~> 0.7)
28
+ thor (>= 0.19.4, < 2.0)
29
+ tins (~> 1.6)
30
+ docile (1.4.0)
31
+ i18n (1.8.10)
32
+ concurrent-ruby (~> 1.0)
33
+ json (2.5.1)
34
+ method_source (1.0.0)
35
+ minitest (5.14.4)
36
+ mustache (1.1.1)
37
+ rake (13.0.6)
38
+ rdiscount (2.2.0.2)
39
+ redcarpet (3.5.1)
51
40
  rocco (0.8.2)
52
41
  mustache
53
42
  redcarpet
54
- simplecov (0.10.0)
55
- docile (~> 1.1.0)
56
- json (~> 1.8)
43
+ simplecov (0.16.1)
44
+ docile (~> 1.1)
45
+ json (>= 1.8, < 3)
57
46
  simplecov-html (~> 0.10.0)
58
- simplecov-html (0.10.0)
59
- term-ansicolor (1.3.0)
47
+ simplecov-html (0.10.2)
48
+ sync (0.5.0)
49
+ term-ansicolor (1.7.1)
60
50
  tins (~> 1.0)
61
- thor (0.19.1)
62
- thread_safe (0.3.5)
63
- thread_safe (0.3.5-java)
64
- tins (1.5.1)
65
- tzinfo (0.3.44)
66
- unf (0.1.4)
67
- unf_ext
68
- unf (0.1.4-java)
69
- unf_ext (0.0.7.1)
51
+ thor (1.1.0)
52
+ tins (1.29.1)
53
+ sync
54
+ tzinfo (2.0.4)
55
+ concurrent-ruby (~> 1.0)
56
+ zeitwerk (2.4.2)
70
57
 
71
58
  PLATFORMS
72
59
  java
@@ -83,4 +70,4 @@ DEPENDENCIES
83
70
  rocco
84
71
 
85
72
  BUNDLED WITH
86
- 1.10.6
73
+ 2.2.26
data/README.md CHANGED
@@ -1,27 +1,11 @@
1
1
  M.RB
2
- ----
3
-
4
- `m` stands for metal, a better test/unit test runner that can run tests by line number.
5
2
 
6
- ________________________________________________________________________________
7
- _________________________/\\\\____________/\\\\_________________________________
8
- _________________________\/\\\\\\________/\\\\\\________________________________
9
- __________________________\/\\\//\\\____/\\\//\\\_______________________________
10
- ___________________________\/\\\\///\\\/\\\/_\/\\\______________________________
11
- ____________________________\/\\\__\///\\\/___\/\\\_____________________________
12
- _____________________________\/\\\____\///_____\/\\\____________________________
13
- ______________________________\/\\\_____________\/\\\___________________________
14
- _______________________________\/\\\_____________\/\\\__________________________
15
- ________________________________\///______________\///__________________________
16
- ________________________________________________________________________________
3
+ [![Gem Version](https://badge.fury.io/rb/m.svg)](https://rubygems.org/gems/m) [![Code Climate](https://codeclimate.com/github/qrush/m.svg)](https://codeclimate.com/github/qrush/m) [![Build Status](https://travis-ci.org/qrush/m.svg?branch=master)](https://travis-ci.org/qrush/m) [![Coverage Status](https://coveralls.io/repos/qrush/m/badge.svg?branch=master)](https://coveralls.io/r/qrush/m)
17
4
 
18
5
 
19
- - [![Gem Version](https://badge.fury.io/rb/m.png)](https://rubygems.org/gems/m)
20
- - [![Code Climate](https://codeclimate.com/github/qrush/m.png)](https://codeclimate.com/github/qrush/m)
21
- - [![Build Status](https://travis-ci.org/qrush/m.png)](https://travis-ci.org/qrush/m)
22
- - [![Dependency Status](https://gemnasium.com/qrush/m.png)](https://gemnasium.com/qrush/m)
23
- - [![Coverage Status](https://coveralls.io/repos/qrush/m/badge.png?branch=master)](https://coveralls.io/r/qrush/m)
6
+ ----
24
7
 
8
+ `m` stands for metal, a better test/unit and minitest test runner that can run tests by line number.
25
9
 
26
10
  INSTALL
27
11
  =======
@@ -36,7 +20,7 @@ If you’re using Bundler, you’ll need to include it in your Gemfile. Toss it
36
20
 
37
21
  ``` ruby
38
22
  group :test do
39
- gem 'm', '~> 1.3.1'
23
+ gem 'm', '~> 1.5.0'
40
24
  end
41
25
  ```
42
26
 
@@ -46,11 +30,11 @@ Developing a RubyGem? Add m as a development dependency.
46
30
  ``` ruby
47
31
  Gem::Specification.new do |gem|
48
32
  # ...
49
- gem.add_development_dependency "m", "~> 1.3.1"
33
+ gem.add_development_dependency "m", "~> 1.5.0"
50
34
  end
51
35
  ```
52
36
 
53
- m works on Ruby 2.0+ only.
37
+ m works on Ruby 2.0+ only and support is only provided for [versions currently maintained by the community](https://www.ruby-lang.org/en/downloads/branches/).
54
38
 
55
39
 
56
40
  USAGE
@@ -114,6 +98,31 @@ Want to run the whole test? Just leave off the line number.
114
98
 
115
99
  1 tests, 2 assertions, 0 failures, 0 errors, 0 skips
116
100
 
101
+ If you want to run all the tests in a directory as well as its subdirectories, use the `-r` flag:
102
+
103
+ $ m -r test/models
104
+ "Searching provided directory for tests recursively"
105
+ Run options:
106
+
107
+ ..
108
+
109
+ Finished in 3.459902s, 45.0880 runs/s, 87.5747 assertions/s.
110
+
111
+ 156 tests, 303 assertions, 0 failures, 0 errors, 13 skips
112
+
113
+ If you need to pass some option down to the actual runner, that is also supported:
114
+
115
+ $ m test/models -- --seed 1234
116
+ Run options: --seed 1234
117
+
118
+ ..
119
+
120
+ Finished in 3.459902s, 45.0880 runs/s, 87.5747 assertions/s.
121
+
122
+ 156 tests, 303 assertions, 0 failures, 0 errors, 13 skips
123
+
124
+ Ensure that you use the `--` before the options, otherwise you'll get an invalid option error. Also, these extra option should always be the last argument.
125
+
117
126
 
118
127
  SUPPORT
119
128
  =======
@@ -123,11 +132,23 @@ SUPPORT
123
132
  - Test::Unit
124
133
  - ActiveSupport::TestCase
125
134
  - MiniTest::Unit::TestCase
135
+ - Minitest
126
136
 
127
137
 
128
138
  CONTRIBUTING
129
139
  ============
130
140
 
141
+ ## Setup
142
+
143
+ This project uses [Appraisal](https://github.com/thoughtbot/appraisal) to test against different versions of dependencies.
144
+
145
+ To install all scenarios (appraisals):
146
+
147
+ bundle install
148
+ bundle exec appraisal install
149
+
150
+ ## Testing
151
+
131
152
  You can run all the tests with:
132
153
 
133
154
  bundle exec rake tests
@@ -138,11 +159,7 @@ You can also run tests selectively. For minitest 4 run:
138
159
 
139
160
  and the ones for minitest 5 with:
140
161
 
141
- appraisal minitest5 rake test TEST=test/minitest_5_test.rb
142
-
143
- In the case of minitest 5, we have to specify the test to run, because running
144
- the whole suite will fail due to incompatibilities with ruby (at least until
145
- 2.1.1).
162
+ appraisal minitest5 rake test
146
163
 
147
164
 
148
165
  LICENSE
data/gemfiles/minitest4.gemfile CHANGED
@@ -2,7 +2,9 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "coveralls", :require => false, :group => :coverage
6
- gem "minitest", "4.7.5"
5
+ gem "coveralls", require: false
6
+ gem "benchmark-ips"
7
+ gem "allocation_stats"
8
+ gem "minitest", "~> 4"
7
9
 
8
- gemspec :path => "../"
10
+ gemspec path: "../"
data/gemfiles/minitest4.gemfile.lock CHANGED
@@ -1,85 +1,73 @@
1
1
  PATH
2
- remote: ../
2
+ remote: ..
3
3
  specs:
4
- m (1.3.4)
4
+ m (1.5.1)
5
5
  method_source (>= 0.6.7)
6
6
  rake (>= 0.9.2.2)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- activesupport (4.0.2)
12
- i18n (~> 0.6, >= 0.6.4)
11
+ activesupport (4.0.13)
12
+ i18n (~> 0.6, >= 0.6.9)
13
13
  minitest (~> 4.2)
14
14
  multi_json (~> 1.3)
15
15
  thread_safe (~> 0.1)
16
16
  tzinfo (~> 0.3.37)
17
- appraisal (0.5.2)
17
+ allocation_stats (0.1.5)
18
+ appraisal (2.4.1)
18
19
  bundler
19
20
  rake
20
- atomic (1.1.14)
21
- atomic (1.1.14-java)
22
- coveralls (0.8.1)
23
- json (~> 1.8)
24
- rest-client (>= 1.6.8, < 2)
25
- simplecov (~> 0.10.0)
21
+ thor (>= 0.14.0)
22
+ benchmark-ips (2.9.1)
23
+ concurrent-ruby (1.1.9)
24
+ coveralls (0.8.23)
25
+ json (>= 1.8, < 3)
26
+ simplecov (~> 0.16.1)
26
27
  term-ansicolor (~> 1.3)
27
- thor (~> 0.19.1)
28
- docile (1.1.5)
29
- domain_name (0.5.24)
30
- unf (>= 0.0.5, < 1.0.0)
31
- http-cookie (1.0.2)
32
- domain_name (~> 0.5)
33
- i18n (0.6.9)
34
- json (1.8.2)
35
- json (1.8.2-java)
36
- method_source (0.8.2)
37
- mime-types (2.5)
28
+ thor (>= 0.19.4, < 2.0)
29
+ tins (~> 1.6)
30
+ docile (1.4.0)
31
+ i18n (0.9.5)
32
+ concurrent-ruby (~> 1.0)
33
+ json (2.5.1)
34
+ method_source (1.0.0)
38
35
  minitest (4.7.5)
39
- multi_json (1.8.4)
40
- mustache (1.0.2)
41
- netrc (0.10.3)
42
- rake (10.1.1)
43
- rdiscount (2.1.8)
44
- redcarpet (3.3.2)
45
- rest-client (1.8.0)
46
- http-cookie (>= 1.0.2, < 2.0)
47
- mime-types (>= 1.16, < 3.0)
48
- netrc (~> 0.7)
36
+ multi_json (1.15.0)
37
+ mustache (1.1.1)
38
+ rake (13.0.6)
39
+ rdiscount (2.2.0.2)
40
+ redcarpet (3.5.1)
49
41
  rocco (0.8.2)
50
42
  mustache
51
43
  redcarpet
52
- simplecov (0.10.0)
53
- docile (~> 1.1.0)
54
- json (~> 1.8)
44
+ simplecov (0.16.1)
45
+ docile (~> 1.1)
46
+ json (>= 1.8, < 3)
55
47
  simplecov-html (~> 0.10.0)
56
- simplecov-html (0.10.0)
57
- term-ansicolor (1.3.0)
48
+ simplecov-html (0.10.2)
49
+ sync (0.5.0)
50
+ term-ansicolor (1.7.1)
58
51
  tins (~> 1.0)
59
- thor (0.19.1)
60
- thread_safe (0.1.3)
61
- atomic
62
- thread_safe (0.1.3-java)
63
- atomic
64
- tins (1.5.1)
65
- tzinfo (0.3.38)
66
- unf (0.1.4)
67
- unf_ext
68
- unf (0.1.4-java)
69
- unf_ext (0.0.7.1)
52
+ thor (1.1.0)
53
+ thread_safe (0.3.6)
54
+ tins (1.29.1)
55
+ sync
56
+ tzinfo (0.3.60)
70
57
 
71
58
  PLATFORMS
72
- java
73
59
  ruby
74
60
 
75
61
  DEPENDENCIES
76
62
  activesupport
63
+ allocation_stats
77
64
  appraisal
65
+ benchmark-ips
78
66
  coveralls
79
67
  m!
80
- minitest (= 4.7.5)
68
+ minitest (~> 4)
81
69
  rdiscount
82
70
  rocco
83
71
 
84
72
  BUNDLED WITH
85
- 1.10.6
73
+ 2.2.26
data/gemfiles/minitest5.gemfile CHANGED
@@ -2,7 +2,9 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "coveralls", :require => false, :group => :coverage
6
- gem "minitest"
5
+ gem "coveralls", require: false
6
+ gem "benchmark-ips"
7
+ gem "allocation_stats"
8
+ gem "minitest", "~> 5"
7
9
 
8
- gemspec :path => "../"
10
+ gemspec path: "../"
data/gemfiles/minitest5.gemfile.lock CHANGED
@@ -1,75 +1,73 @@
1
1
  PATH
2
- remote: ../
2
+ remote: ..
3
3
  specs:
4
- m (1.3.4)
4
+ m (1.5.1)
5
5
  method_source (>= 0.6.7)
6
6
  rake (>= 0.9.2.2)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- activesupport (3.2.16)
12
- i18n (~> 0.6, >= 0.6.4)
13
- multi_json (~> 1.0)
14
- appraisal (0.5.2)
11
+ activesupport (6.1.4.1)
12
+ concurrent-ruby (~> 1.0, >= 1.0.2)
13
+ i18n (>= 1.6, < 2)
14
+ minitest (>= 5.1)
15
+ tzinfo (~> 2.0)
16
+ zeitwerk (~> 2.3)
17
+ allocation_stats (0.1.5)
18
+ appraisal (2.4.1)
15
19
  bundler
16
20
  rake
17
- coveralls (0.8.1)
18
- json (~> 1.8)
19
- rest-client (>= 1.6.8, < 2)
20
- simplecov (~> 0.10.0)
21
+ thor (>= 0.14.0)
22
+ benchmark-ips (2.9.1)
23
+ concurrent-ruby (1.1.9)
24
+ coveralls (0.8.23)
25
+ json (>= 1.8, < 3)
26
+ simplecov (~> 0.16.1)
21
27
  term-ansicolor (~> 1.3)
22
- thor (~> 0.19.1)
23
- docile (1.1.5)
24
- domain_name (0.5.24)
25
- unf (>= 0.0.5, < 1.0.0)
26
- http-cookie (1.0.2)
27
- domain_name (~> 0.5)
28
- i18n (0.6.9)
29
- json (1.8.2)
30
- json (1.8.2-java)
31
- method_source (0.8.2)
32
- mime-types (2.5)
33
- minitest (5.3.1)
34
- multi_json (1.8.4)
35
- mustache (1.0.2)
36
- netrc (0.10.3)
37
- rake (10.1.1)
38
- rdiscount (2.1.8)
39
- redcarpet (3.3.2)
40
- rest-client (1.8.0)
41
- http-cookie (>= 1.0.2, < 2.0)
42
- mime-types (>= 1.16, < 3.0)
43
- netrc (~> 0.7)
28
+ thor (>= 0.19.4, < 2.0)
29
+ tins (~> 1.6)
30
+ docile (1.4.0)
31
+ i18n (1.8.10)
32
+ concurrent-ruby (~> 1.0)
33
+ json (2.5.1)
34
+ method_source (1.0.0)
35
+ minitest (5.14.4)
36
+ mustache (1.1.1)
37
+ rake (13.0.6)
38
+ rdiscount (2.2.0.2)
39
+ redcarpet (3.5.1)
44
40
  rocco (0.8.2)
45
41
  mustache
46
42
  redcarpet
47
- simplecov (0.10.0)
48
- docile (~> 1.1.0)
49
- json (~> 1.8)
43
+ simplecov (0.16.1)
44
+ docile (~> 1.1)
45
+ json (>= 1.8, < 3)
50
46
  simplecov-html (~> 0.10.0)
51
- simplecov-html (0.10.0)
52
- term-ansicolor (1.3.0)
47
+ simplecov-html (0.10.2)
48
+ sync (0.5.0)
49
+ term-ansicolor (1.7.1)
53
50
  tins (~> 1.0)
54
- thor (0.19.1)
55
- tins (1.5.1)
56
- unf (0.1.4)
57
- unf_ext
58
- unf (0.1.4-java)
59
- unf_ext (0.0.7.1)
51
+ thor (1.1.0)
52
+ tins (1.29.1)
53
+ sync
54
+ tzinfo (2.0.4)
55
+ concurrent-ruby (~> 1.0)
56
+ zeitwerk (2.4.2)
60
57
 
61
58
  PLATFORMS
62
- java
63
59
  ruby
64
60
 
65
61
  DEPENDENCIES
66
62
  activesupport
63
+ allocation_stats
67
64
  appraisal
65
+ benchmark-ips
68
66
  coveralls
69
67
  m!
70
- minitest
68
+ minitest (~> 5)
71
69
  rdiscount
72
70
  rocco
73
71
 
74
72
  BUNDLED WITH
75
- 1.10.6
73
+ 2.2.26