YUKI Hiroshi
null+****@clear*****
Fri Dec 5 14:34:23 JST 2014
YUKI Hiroshi 2014-12-05 14:34:23 +0900 (Fri, 05 Dec 2014) New Revision: b8bc1caa7fb2696d973bdcfd436c6b2bc2c0cd10 https://github.com/droonga/droonga-engine/commit/b8bc1caa7fb2696d973bdcfd436c6b2bc2c0cd10 Merged e0f9f34: Merge pull request #30 from piroor/replicas-in-a-branch Message: Update expected catalog fragments for future V3 catalog Modified files: test/unit/catalog/test_slice.rb test/unit/catalog/test_slices.rb Modified: test/unit/catalog/test_slice.rb (+21 -19) =================================================================== --- test/unit/catalog/test_slice.rb 2014-12-05 13:16:42 +0900 (550fce8) +++ test/unit/catalog/test_slice.rb 2014-12-05 14:34:23 +0900 (e3ebedd) @@ -88,8 +88,10 @@ class CatalogSliceTest < Test::Unit::TestCase assert_equal("127.0.0.1:10047/volume.000", slice.volume.address.to_s) end + end - def test_all_nodes + class AllNodesTest < self + def test_single data = { "volume" => { "address" => "127.0.0.1:10047/volume.000", @@ -100,34 +102,34 @@ class CatalogSliceTest < Test::Unit::TestCase slice.all_nodes) end - def test_nested + def test_replicas data = { - "replicas" => [ - { - "volume" => { - "address" => "127.0.0.1:10047/volume.000", + "volume" => { + "replicas" => [ + { + "volume" => { + "address" => "127.0.0.1:10047/volume.000", + }, }, - }, - ], + ], + }, } slice = create_slice(data) assert_equal(["127.0.0.1:10047/volume"], slice.all_nodes) end - def test_deeply_nested + def test_slices data = { - "replicas" => [ - { - "slices" => [ - { - "volume" => { - "address" => "127.0.0.1:10047/volume.000", - }, + "volume" => { + "slices" => [ + { + "volume" => { + "address" => "127.0.0.1:10047/volume.000", }, - ], - }, - ], + }, + ], + }, } slice = create_slice(data) assert_equal(["127.0.0.1:10047/volume"], Modified: test/unit/catalog/test_slices.rb (+36 -28) =================================================================== --- test/unit/catalog/test_slices.rb 2014-12-05 13:16:42 +0900 (8c957a5) +++ test/unit/catalog/test_slices.rb 2014-12-05 14:34:23 +0900 (1df66a9) @@ -101,8 +101,8 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase end end - class NodesTest < self - def test_all_nodes + class AllNodesTest < self + def test_slices data = { "slices" => [ { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } }, @@ -116,20 +116,24 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase volume.all_nodes) end - def test_nested + def test_replicas_in_slice data = { "slices" => [ { - "replicas" => [ - { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } }, - { "volume" => { "address" => "127.0.0.1:23003/droonga.001" } }, - ], + "volume" => { + "replicas" => [ + { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } }, + { "volume" => { "address" => "127.0.0.1:23003/droonga.001" } }, + ], + }, }, { - "replicas" => [ - { "volume" => { "address" => "127.0.0.1:23004/droonga.100" } }, - { "volume" => { "address" => "127.0.0.1:23004/droonga.101" } }, - ], + "volume" => { + "replicas" => [ + { "volume" => { "address" => "127.0.0.1:23004/droonga.100" } }, + { "volume" => { "address" => "127.0.0.1:23004/droonga.101" } }, + ], + }, }, ], } @@ -138,28 +142,32 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase volume.all_nodes) end - def test_deeply_nested + def test_slices_in_replicas_in_slice data = { "slices" => [ { - "replicas" => [ - { - "slices" => [ - { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } }, - { "volume" => { "address" => "127.0.0.1:23003/droonga.001" } }, - ], - }, - ], + "volume" => { + "replicas" => [ + { + "slices" => [ + { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } }, + { "volume" => { "address" => "127.0.0.1:23003/droonga.001" } }, + ], + }, + ], + }, }, { - "replicas" => [ - { - "slices" => [ - { "volume" => { "address" => "127.0.0.1:23004/droonga.100" } }, - { "volume" => { "address" => "127.0.0.1:23004/droonga.101" } }, - ], - }, - ], + "volume" => { + "replicas" => [ + { + "slices" => [ + { "volume" => { "address" => "127.0.0.1:23004/droonga.100" } }, + { "volume" => { "address" => "127.0.0.1:23004/droonga.101" } }, + ], + }, + ], + }, }, ], } -------------- next part -------------- HTML����������������������������...Télécharger
