Kouhei Sutou
null+****@clear*****
Wed Feb 26 14:48:19 JST 2014
Kouhei Sutou 2014-02-26 14:48:19 +0900 (Wed, 26 Feb 2014) New Revision: 150f4f7b090224599871acbef88a5c4199ce0319 https://github.com/droonga/fluent-plugin-droonga/commit/150f4f7b090224599871acbef88a5c4199ce0319 Message: catalog v2: disable validation for now Modified files: lib/droonga/catalog/version2.rb test/unit/catalog/test_version2.rb Modified: lib/droonga/catalog/version2.rb (+3 -4) =================================================================== --- lib/droonga/catalog/version2.rb 2014-02-26 14:47:56 +0900 (286acbd) +++ lib/droonga/catalog/version2.rb 2014-02-26 14:48:19 +0900 (634696e) @@ -18,10 +18,9 @@ require "droonga/catalog/base" module Droonga module Catalog class Version2 < Base - def validate_effective_date - date = @data["effectiveDate"] - validate_required_parameter(date, "effectiveDate") - validate_valid_datetime(date, "effectiveDate") + private + def validate + # TODO: Implement me. end end end Modified: test/unit/catalog/test_version2.rb (+0 -191) =================================================================== --- test/unit/catalog/test_version2.rb 2014-02-26 14:47:56 +0900 (d25e8ad) +++ test/unit/catalog/test_version2.rb 2014-02-26 14:48:19 +0900 (bbbed24) @@ -184,195 +184,4 @@ class CatalogTestVersion2 < Test::Unit::TestCase end end end - - class ValidationTest < self - class << self - def farm_name - "localhost:23041/droonga" - end - - def ring_name - "localhost:23041" - end - - def range_name - "2013-09-01" - end - - def path - "path/to/catalog" - end - - def valid_farms - { - farm_name => { - "device" => ".", - }, - } - end - - def valid_zones - valid_farms.keys - end - - def valid_dataset_base - { - "workers" => 0, - "number_of_replicas" => 1, - "number_of_partitions" => 1, - "partition_key" => "_key", - "date_range" => "infinity", - "ring" => {}, - } - end - end - - data( - :missing_root_elements => { - :catalog => {}, - :errors => [ - Droonga::Catalog::MissingRequiredParameter.new( - "effectiveDate", path), - Droonga::Catalog::MissingRequiredParameter.new( - "zones", path), - Droonga::Catalog::MissingRequiredParameter.new( - "farms", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets", path), - ], - }, - :invalid_farms => { - :catalog => minimum_data.merge( - "farms" => { - farm_name => { - }, - }, - "zones" => [farm_name], - ), - :errors => [ - Droonga::Catalog::MissingRequiredParameter.new( - "farms.#{farm_name}.device", path), - ], - }, - :missing_dataset_parameters => { - :catalog => minimum_data.merge( - "farms" => valid_farms, - "zones" => valid_zones, - "datasets" => { - "Droonga" => { - }, - }, - ), - :errors => [ - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.workers", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.number_of_replicas", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.number_of_partitions", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.partition_key", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.date_range", path), - Droonga::Catalog::MissingRequiredParameter.new( - "datasets.Droonga.ring", path), - ], - }, - :invalid_date_parameters => { - :catalog => minimum_data.merge( - "effectiveDate" => "invalid", - ), - :errors => [ - Droonga::Catalog::InvalidDate.new( - "effectiveDate", "invalid", path), - ], - }, - :non_integer_numeric_parameters => { - :catalog => minimum_data.merge( - "farms" => valid_farms, - "zones" => valid_zones, - "datasets" => { - "Droonga" => valid_dataset_base.merge( - "workers" => 0.1, - "number_of_replicas" => 0.1, - "number_of_partitions" => 0.1, - "ring" => { - ring_name => { - "weight" => 0.1, - "partitions" => {}, - }, - }, - ), - }, - ), - :errors => [ - Droonga::Catalog::MismatchedParameterType.new( - "datasets.Droonga.workers", Integer, Float, path), - Droonga::Catalog::MismatchedParameterType.new( - "datasets.Droonga.number_of_replicas", Integer, Float, path), - Droonga::Catalog::MismatchedParameterType.new( - "datasets.Droonga.number_of_partitions", Integer, Float, path), - ], - }, - :negative_numeric_parameters => { - :catalog => minimum_data.merge( - "farms" => valid_farms, - "zones" => valid_zones, - "datasets" => { - "Droonga" => valid_dataset_base.merge( - "workers" => -1, - "number_of_replicas" => -1, - "number_of_partitions" => -1, - "ring" => { - ring_name => { - "weight" => -1, - "partitions" => {}, - }, - }, - ), - }, - ), - :errors => [ - Droonga::Catalog::NegativeNumber.new( - "datasets.Droonga.workers", -1, path), - Droonga::Catalog::SmallerThanOne.new( - "datasets.Droonga.number_of_replicas", -1, path), - Droonga::Catalog::SmallerThanOne.new( - "datasets.Droonga.number_of_partitions", -1, path), - Droonga::Catalog::NegativeNumber.new( - "datasets.Droonga.ring.#{ring_name}.weight", -1, path), - ], - }, - :broken_relations_unknown_farm => { - :catalog => minimum_data.merge( - "farms" => valid_farms, - "zones" => valid_zones, - "datasets" => { - "Droonga" => valid_dataset_base.merge( - "ring" => { - ring_name => { - "weight" => 1, - "partitions" => { - range_name => [ - "unknown:0/unknown.000", - ], - }, - }, - }, - ), - }, - ), - :errors => [ - Droonga::Catalog::UnknownFarmForPartition.new( - "datasets.Droonga.ring.#{ring_name}.partitions.#{range_name}[0]", - "unknown:0/unknown.000", path), - ], - }, - ) - def test_validation(data) - assert_raise(Droonga::MultiplexError.new(data[:errors])) do - create_catalog(data[:catalog], "path/to/catalog") - end - end - end end -------------- next part -------------- HTML����������������������������...Download