From bc374a76530826e7f701c6643a59423a2c912be1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 21 Dec 2015 05:05:09 +0000 Subject: enable "frozen_string_literal: true" While we're in the area, make a wording change from "GPLv3 or later" to "GPL-3.0+", as the latter is favored by SPDX.org --- test/covshow.rb | 3 ++- test/helper.rb | 3 ++- test/player_integration.rb | 3 ++- test/test_buffer.rb | 3 ++- test/test_env.rb | 3 ++- test/test_fadefx.rb | 3 ++- test/test_format.rb | 3 ++- test/test_format_change.rb | 3 ++- test/test_mlib.rb | 3 ++- test/test_parse_freq.rb | 4 ++-- test/test_player.rb | 3 ++- test/test_player_client_handler.rb | 5 +++-- test/test_player_integration.rb | 3 ++- test/test_process.rb | 7 ++++--- test/test_rg_integration.rb | 3 ++- test/test_rg_state.rb | 3 ++- test/test_sink.rb | 3 ++- test/test_sink_pipe_size.rb | 3 ++- test/test_sink_tee_integration.rb | 3 ++- test/test_source_av.rb | 5 +++-- test/test_source_sox.rb | 7 ++++--- test/test_splitfx.rb | 3 ++- test/test_tfx.rb | 3 ++- test/test_tracklist.rb | 3 ++- test/test_unixserver.rb | 3 ++- test/test_util.rb | 3 ++- 26 files changed, 58 insertions(+), 33 deletions(-) (limited to 'test') diff --git a/test/covshow.rb b/test/covshow.rb index 13274b9..a7e1368 100644 --- a/test/covshow.rb +++ b/test/covshow.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true # # this works with the __covmerge method in test/helper.rb # run this file after all tests are run diff --git a/test/helper.rb b/test/helper.rb index c78e14b..9bf0d0d 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true $stdout.sync = $stderr.sync = Thread.abort_on_exception = true require 'thread' WAIT_ALL_MTX = Mutex.new diff --git a/test/player_integration.rb b/test/player_integration.rb index bce2621..f282a05 100644 --- a/test/player_integration.rb +++ b/test/player_integration.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/player' require 'dtas/state_file' diff --git a/test/test_buffer.rb b/test/test_buffer.rb index 72a8593..ae0c203 100644 --- a/test/test_buffer.rb +++ b/test/test_buffer.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'stringio' require 'dtas/buffer' diff --git a/test/test_env.rb b/test/test_env.rb index 6b36f32..3bbb372 100644 --- a/test/test_env.rb +++ b/test/test_env.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require_relative 'helper' require 'dtas/process' class TestEnv < Testcase diff --git a/test/test_fadefx.rb b/test/test_fadefx.rb index 5c84578..a82e9c1 100644 --- a/test/test_fadefx.rb +++ b/test/test_fadefx.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require_relative 'helper' require 'dtas/fadefx' require 'dtas/format' diff --git a/test/test_format.rb b/test/test_format.rb index 11faf16..7d9ffee 100644 --- a/test/test_format.rb +++ b/test/test_format.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'tempfile' require 'dtas/format' diff --git a/test/test_format_change.rb b/test/test_format_change.rb index 6fcb967..ee96de3 100644 --- a/test/test_format_change.rb +++ b/test/test_format_change.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/player_integration' require 'tmpdir' class TestFormatChange < Testcase diff --git a/test/test_mlib.rb b/test/test_mlib.rb index 072d1d0..bc3088a 100644 --- a/test/test_mlib.rb +++ b/test/test_mlib.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require_relative 'helper' begin require 'dtas/mlib' diff --git a/test/test_parse_freq.rb b/test/test_parse_freq.rb index 1dcd8d6..7b3cb60 100644 --- a/test/test_parse_freq.rb +++ b/test/test_parse_freq.rb @@ -1,7 +1,7 @@ # Copyright (C) 2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' - require 'dtas/parse_freq' class TestParseFreq < Testcase diff --git a/test/test_player.rb b/test/test_player.rb index fe61441..6959a38 100644 --- a/test/test_player.rb +++ b/test/test_player.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'tempfile' require 'dtas/player' diff --git a/test/test_player_client_handler.rb b/test/test_player_client_handler.rb index a100ad1..955a7dd 100644 --- a/test/test_player_client_handler.rb +++ b/test/test_player_client_handler.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/player' @@ -88,7 +89,7 @@ class TestPlayerClientHandler < Testcase res = @io[0] result = {} Shellwords.split(res).each do |kv| - k, v = kv.split(/=/, 2) + k, v = kv.split('=', 2) result[k] = v end expect = ENV.to_hash diff --git a/test/test_player_integration.rb b/test/test_player_integration.rb index acbb75c..982b83b 100644 --- a/test/test_player_integration.rb +++ b/test/test_player_integration.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/player_integration' class TestPlayerIntegration < Testcase include PlayerIntegration diff --git a/test/test_process.rb b/test/test_process.rb index c6354cc..4170846 100644 --- a/test/test_process.rb +++ b/test/test_process.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/process' class TestProcess < Testcase @@ -7,7 +8,7 @@ class TestProcess < Testcase def test_encoding assert_equal Encoding::BINARY, qx('echo HIHIH').encoding - s = "" + s = "".b a = qx('echo HIHIHI; echo >&2 BYEBYE', err_str: s) assert_equal Encoding::BINARY, a.encoding end @@ -23,7 +24,7 @@ class TestProcess < Testcase end def test_qx_err_str - s = "" + s = "".b assert_equal "", qx('echo HELLO >&2', err_str: s) assert_equal "HELLO\n", s end diff --git a/test/test_rg_integration.rb b/test/test_rg_integration.rb index efc8f97..917a046 100644 --- a/test/test_rg_integration.rb +++ b/test/test_rg_integration.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/player_integration' require 'dtas/util' class TestRgIntegration < Testcase diff --git a/test/test_rg_state.rb b/test/test_rg_state.rb index b16438c..a26eb13 100644 --- a/test/test_rg_state.rb +++ b/test/test_rg_state.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/rg_state' diff --git a/test/test_sink.rb b/test/test_sink.rb index e23315a..ead76ad 100644 --- a/test/test_sink.rb +++ b/test/test_sink.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/sink' require 'yaml' diff --git a/test/test_sink_pipe_size.rb b/test/test_sink_pipe_size.rb index ef56bc5..0c2fe30 100644 --- a/test/test_sink_pipe_size.rb +++ b/test/test_sink_pipe_size.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true begin require 'io/splice' require './test/player_integration' diff --git a/test/test_sink_tee_integration.rb b/test/test_sink_tee_integration.rb index 77d374b..f51b4b1 100644 --- a/test/test_sink_tee_integration.rb +++ b/test/test_sink_tee_integration.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/player_integration' class TestSinkTeeIntegration < Testcase include PlayerIntegration diff --git a/test/test_source_av.rb b/test/test_source_av.rb index 09b220e..af68002 100644 --- a/test/test_source_av.rb +++ b/test/test_source_av.rb @@ -1,12 +1,13 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/source/av' require 'tempfile' class TestSourceAv < Testcase def teardown - @tempfiles.each { |tmp| tmp.close! } + @tempfiles.each(&:close!) end def setup diff --git a/test/test_source_sox.rb b/test/test_source_sox.rb index d9d9503..e9fc0f8 100644 --- a/test/test_source_sox.rb +++ b/test/test_source_sox.rb @@ -1,12 +1,13 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/source/sox' require 'tempfile' class TestSource < Testcase def teardown - @tempfiles.each { |tmp| tmp.close! } + @tempfiles.each(&:close!) end def setup @@ -134,7 +135,7 @@ class TestSource < Testcase def test_flac_cuesheet_48 return if `which metaflac`.strip.size == 0 - ver = `flac --version`.split(/ /)[1].strip + ver = `flac --version`.split(' ')[1].strip ver.to_f >= 1.3 or return # flac 1.3.0 fixed non-44.1k rate support tmp = Tempfile.new(%W(tmp .flac)) diff --git a/test/test_splitfx.rb b/test/test_splitfx.rb index 49df49d..198517a 100644 --- a/test/test_splitfx.rb +++ b/test/test_splitfx.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require 'yaml' require 'dtas/splitfx' require 'thread' diff --git a/test/test_tfx.rb b/test/test_tfx.rb index 59aa697..a4d8214 100644 --- a/test/test_tfx.rb +++ b/test/test_tfx.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/tfx' require 'dtas/format' diff --git a/test/test_tracklist.rb b/test/test_tracklist.rb index c05090c..3842daf 100644 --- a/test/test_tracklist.rb +++ b/test/test_tracklist.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require_relative 'helper' require 'dtas/tracklist' class TestTracklist < Testcase diff --git a/test/test_unixserver.rb b/test/test_unixserver.rb index 2a84dcb..c5032ba 100644 --- a/test/test_unixserver.rb +++ b/test/test_unixserver.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'tempfile' require 'dtas/unix_server' diff --git a/test/test_util.rb b/test/test_util.rb index c1eb463..ebdb534 100644 --- a/test/test_util.rb +++ b/test/test_util.rb @@ -1,5 +1,6 @@ # Copyright (C) 2013-2015 all contributors -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) +# frozen_string_literal: true require './test/helper' require 'dtas/util' -- cgit v1.2.3-24-ge0c7