ruby_protobuf 0.3.3 → 0.4.1

data/test/test_compiler.rb

@@ -1,11 +1,10 @@
 require 'test/unit'
-#require 'protobuf/compiler/compiler_old'
 require 'protobuf/compiler/compiler'
 
 class CompilerTest < Test::Unit::TestCase
   # Issue 12:    Parse error on float default value
   def test_compile_float_default
-    assert_compile_proto <<-eos, 'test/proto/float_default.proto'
+    assert_compile_proto(<<-EOS, 'test/proto/float_default.proto')
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/float_default.proto>
 # message M {  
@@ -34,11 +33,11 @@ class M < ::Protobuf::Message
   optional :float, :k, 6, :default => 23
   optional :float, :l, 7, :default => 23.42
 end
-    eos
+    EOS
   end
 
   def test_create_message
-    assert_compile_proto <<-eos, 'test/proto/addressbook.proto'
+    assert_compile_proto(<<-EOS, 'test/proto/addressbook.proto')
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/addressbook.proto>
 # package tutorial;
@@ -65,9 +64,11 @@ end
 #   extensions 100 to 200;
 # }
 # 
+# /*
 # extend Person {
 #   optional int32 age = 100;
 # }
+# */
 # 
 # message AddressBook {
 #   repeated Person person = 1;
@@ -87,9 +88,9 @@ module Tutorial
     
     class PhoneType < ::Protobuf::Enum
       defined_in __FILE__
-      MOBILE = 0
-      HOME = 1
-      WORK = 2
+      define :MOBILE, 0
+      define :HOME, 1
+      define :WORK, 2
     end
     
     class PhoneNumber < ::Protobuf::Message
@@ -104,23 +105,20 @@ module Tutorial
     extensions 100..200
   end
   
-  class Person < ::Protobuf::Message
-    defined_in __FILE__
-    optional :int32, :age, 100, :extension => true
-  end
-  
   class AddressBook < ::Protobuf::Message
     defined_in __FILE__
     repeated :Person, :person, 1
   end
 end
-    eos
+    EOS
   end
 
   def test_create_nested_message
-    assert_compile_proto <<-eos, 'test/proto/nested.proto'
+    assert_compile_proto(<<-EOS, 'test/proto/nested.proto')
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/nested.proto>
+# package test.nested;
+# 
 # message Foo {  
 #   message Bar {
 #   } 
@@ -128,37 +126,40 @@ end
 # message Baaz {  
 #   optional Foo.Bar x = 1;
 # }
+
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
 require 'protobuf/message/service'
 require 'protobuf/message/extend'
 
-class Foo < ::Protobuf::Message
-  defined_in __FILE__
-  class Bar < ::Protobuf::Message
-    defined_in __FILE__
+module Test
+  module Nested
+    class Foo < ::Protobuf::Message
+      defined_in __FILE__
+      class Bar < ::Protobuf::Message
+        defined_in __FILE__
+      end
+    end
+    class Baaz < ::Protobuf::Message
+      defined_in __FILE__
+      optional :'Foo::Bar', :x, 1
+    end
   end
 end
-
-class Baaz < ::Protobuf::Message
-  defined_in __FILE__
-  optional :'Foo::Bar', :x, 1
-end
-    eos
+    EOS
   end
 
   def test_nested_message
-    Protobuf::Visitor::CreateMessageVisitor.instance_eval {remove_const :Baaz}
     file_contents = Protobuf::Compiler.new.create_message('test/proto/nested.proto', '.', '.', false)
     assert_nothing_raised {Object.class_eval file_contents}
-    assert_raise(TypeError) {Baaz.new.x = 1}
-    assert_nothing_raised {Baaz.new.x = Foo::Bar.new}
+    assert_raise(TypeError) {Test::Nested::Baaz.new.x = 1}
+    assert_nothing_raised {Test::Nested::Baaz.new.x = Test::Nested::Foo::Bar.new}
   end
 
   def test_create_rpc
     file_contents = Protobuf::Compiler.new.create_rpc('test/proto/rpc.proto', '.', 'test/proto', false)
 
-    assert_source <<-eos, file_contents['test/proto/address_book_service.rb']
+    assert_source(<<-EOS, file_contents['test/proto/address_book_service.rb'])
 require 'protobuf/rpc/server'
 require 'protobuf/rpc/handler'
 require 'test/proto/rpc.pb'
@@ -189,16 +190,16 @@ class Tutorial::AddressBookService < Protobuf::Rpc::Server
     }
   end
 end
-    eos
+    EOS
 
-    assert_source <<-eos, file_contents['test/proto/start_address_book_service']
+    assert_source(<<-EOS, file_contents['test/proto/start_address_book_service'])
 #!/usr/bin/env ruby
 require 'address_book_service'
 
-Tutorial::AddressBookService.new(:port => 9999).start
-    eos
+Tutorial::AddressBookService.new(:Port => 9999).start
+    EOS
 
-    assert_source <<-eos, file_contents['test/proto/client_search.rb']
+    assert_source(<<-EOS, file_contents['test/proto/client_search.rb'])
 #!/usr/bin/env ruby
 require 'protobuf/rpc/client'
 require 'test/proto/rpc.pb'
@@ -206,7 +207,7 @@ require 'test/proto/rpc.pb'
 # build request
 request = Tutorial::Person.new
 # TODO: setup a request
-raise StandardError.new('setup a request')
+raise StandardError, 'setup a request'
 
 # create blunk response
 response = Tutorial::AddressBook.new
@@ -216,9 +217,9 @@ Protobuf::Rpc::Client.new('localhost', 9999).call :search, request, response
 
 # show response
 puts response
-    eos
+    EOS
 
-    assert_source <<-eos, file_contents['test/proto/client_add.rb']
+    assert_source(<<-EOS, file_contents['test/proto/client_add.rb'])
 #!/usr/bin/env ruby
 require 'protobuf/rpc/client'
 require 'test/proto/rpc.pb'
@@ -226,7 +227,7 @@ require 'test/proto/rpc.pb'
 # build request
 request = Tutorial::Person.new
 # TODO: setup a request
-raise StandardError.new('setup a request')
+raise StandardError, 'setup a request'
 
 # create blunk response
 response = Tutorial::Person.new
@@ -236,92 +237,92 @@ Protobuf::Rpc::Client.new('localhost', 9999).call :add, request, response
 
 # show response
 puts response
-    eos
+    EOS
   end
 
   def test_create_descriptor
     proto_path = 'test/proto/addressbook.proto'
-    visitor = Protobuf::Visitor::CreateDescriptorVisitor.new proto_path
-    File.open proto_path, 'r' do |file|
+    visitor = Protobuf::Visitor::CreateDescriptorVisitor.new(proto_path)
+    File.open(proto_path) do |file|
       visitor.visit Protobuf::ProtoParser.new.parse(file)
     end
     file_descriptor = visitor.file_descriptor
-    assert_equal proto_path, file_descriptor.name
-    assert_equal 'tutorial', file_descriptor.package
- 
+    assert_equal(proto_path, file_descriptor.name)
+    assert_equal('tutorial', file_descriptor.package)
+
     person_descriptor = file_descriptor.message_type[0]
-    assert_equal 'Person', person_descriptor.name
-    assert_equal [:name, :id, :email, :phone, :age].size, person_descriptor.field.size
+    assert_equal('Person', person_descriptor.name)
+    assert_equal([:name, :id, :email, :phone, :age].size, person_descriptor.field.size)
 
     name_field_descriptor = person_descriptor.field.find {|d| d.name == 'name'}
-    assert_equal 1, name_field_descriptor.number
-    assert_equal Google::Protobuf::FieldDescriptorProto::Type::TYPE_STRING, name_field_descriptor.type
-    assert_equal Google::Protobuf::FieldDescriptorProto::Label::LABEL_REQUIRED, name_field_descriptor.label
-    assert_equal 'string', name_field_descriptor.type_name
+    assert_equal(1, name_field_descriptor.number)
+    assert_equal(Google::Protobuf::FieldDescriptorProto::Type::TYPE_STRING, name_field_descriptor.type)
+    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_REQUIRED, name_field_descriptor.label)
+    assert_equal('string', name_field_descriptor.type_name)
 
     phone_field_descriptor = person_descriptor.field.find {|d| d.name == 'phone'}
-    assert_equal 4, phone_field_descriptor.number
-    assert_equal 0, phone_field_descriptor.type #TODO: is this right?
-    assert_equal Google::Protobuf::FieldDescriptorProto::Label::LABEL_REPEATED, phone_field_descriptor.label
-    assert_equal 'PhoneNumber', phone_field_descriptor.type_name
+    assert_equal(4, phone_field_descriptor.number)
+    assert_equal(0, phone_field_descriptor.type) #TODO: is this right?
+    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_REPEATED, phone_field_descriptor.label)
+    assert_equal('PhoneNumber', phone_field_descriptor.type_name)
 
     age_field_descriptor = person_descriptor.field.find {|d| d.name == 'age'}
-    assert_equal 5, age_field_descriptor.number
-    assert_equal Google::Protobuf::FieldDescriptorProto::Type::TYPE_UINT32, age_field_descriptor.type
-    assert_equal Google::Protobuf::FieldDescriptorProto::Label::LABEL_OPTIONAL, age_field_descriptor.label
-    assert_equal 'uint32', age_field_descriptor.type_name
-    assert_equal '20', age_field_descriptor.default_value
+    assert_equal(5, age_field_descriptor.number)
+    assert_equal(Google::Protobuf::FieldDescriptorProto::Type::TYPE_UINT32, age_field_descriptor.type)
+    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_OPTIONAL, age_field_descriptor.label)
+    assert_equal('uint32', age_field_descriptor.type_name)
+    assert_equal('20', age_field_descriptor.default_value)
 
     phone_type_descriptor = person_descriptor.enum_type.first
-    assert_equal 'PhoneType', phone_type_descriptor.name
-    assert_equal 3, phone_type_descriptor.value.size
+    assert_equal('PhoneType', phone_type_descriptor.name)
+    assert_equal(3, phone_type_descriptor.value.size)
 
     phone_type_home_descriptor = phone_type_descriptor.value.find {|d| d.name == 'HOME'}
-    assert_equal 'HOME', phone_type_home_descriptor.name
-    assert_equal 1, phone_type_home_descriptor.number
+    assert_equal('HOME', phone_type_home_descriptor.name)
+    assert_equal(1, phone_type_home_descriptor.number)
 
     extensions_descriptor = person_descriptor.extension_range.first
-    assert_equal 100, extensions_descriptor.start
-    assert_equal 200, extensions_descriptor.end
+    assert_equal(100, extensions_descriptor.start)
+    assert_equal(200, extensions_descriptor.end)
 
     phone_number_descriptor = person_descriptor.nested_type.first
-    assert_equal 'PhoneNumber', phone_number_descriptor.name
-    assert_equal [:number, :type].size, phone_number_descriptor.field.size
+    assert_equal('PhoneNumber', phone_number_descriptor.name)
+    assert_equal([:number, :type].size, phone_number_descriptor.field.size)
 
     #TODO: test extend
     #extend_person_descriptor = ??
     #assert_equal extend_person_descriptor
 
     addressbook_descriptor = file_descriptor.message_type[1]
-    assert_equal 'AddressBook', addressbook_descriptor.name
+    assert_equal('AddressBook', addressbook_descriptor.name)
   end
 
   def test_collision
-    assert_raise Protobuf::Message::TagCollisionError do require 'test/collision' end
-    assert_raise Protobuf::Message::TagCollisionError do 
-      Protobuf::Compiler.new.create_message('test/proto/collision.proto', '.', '.', false) 
+    assert_raise(Protobuf::TagCollisionError) do require 'test/proto/collision.pb' end
+    assert_raise(Protobuf::TagCollisionError) do
+      Protobuf::Compiler.new.create_message('test/proto/collision.proto', '.', '.', false)
     end
   end
 
   def test_ext_collision
-    assert_raise Protobuf::Message::TagCollisionError do require 'test/ext_collision' end
-    assert_raise Protobuf::Message::TagCollisionError do 
-      Protobuf::Compiler.new.create_message('test/proto/ext_collision.proto', '.', '.', false) 
+    assert_raise(Protobuf::TagCollisionError) do require 'test/proto/ext_collision.pb' end
+    assert_raise(Protobuf::TagCollisionError) do
+      Protobuf::Compiler.new.create_message('test/proto/ext_collision.proto', '.', '.', false)
     end
   end
 
   def test_ext_range
-    assert_raise RangeError do require 'test/ext_range' end
-    assert_raise RangeError do 
-      Protobuf::Compiler.new.create_message('test/proto/ext_range.proto', '.', '.', false) 
+    assert_raise(RangeError) do require 'test/proto/ext_range.pb' end
+    assert_raise(RangeError) do
+      Protobuf::Compiler.new.create_message('test/proto/ext_range.proto', '.', '.', false)
     end
   end
 
   def assert_compile_proto(ideal, filename)
-    assert_equal ideal.gsub(/^\s*\n/, '').strip, Protobuf::Compiler.new.create_message(filename, '.', '.', false).gsub(/^\s*\n/, '').strip
+    assert_equal(ideal.gsub(/^\s*\n/, '').strip, Protobuf::Compiler.new.create_message(filename, '.', '.', false).gsub(/^\s*\n/, '').strip)
   end
 
   def assert_source(ideal, real)
-    assert_equal ideal.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"), real.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n")
+    assert_equal(ideal.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"), real.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"))
   end
 end

data/test/test_descriptor.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'test/addressbook'
+require 'test/proto/addressbook.pb'
 require 'protobuf/descriptor/descriptor_builder'
 require 'protobuf/descriptor/descriptor_proto'
 
@@ -63,7 +63,7 @@ class DescriptorTest < Test::Unit::TestCase
     person_phone_number_number_proto.type = FieldDescriptorProto::Type::TYPE_STRING
     person_phone_number_number_proto.name = 'number'
     person_phone_number_number_proto.number = 1
-    
+
     person_phone_number_type_proto = FieldDescriptorProto.new
     person_phone_number_proto.field << person_phone_number_type_proto
     person_phone_number_type_proto.label = FieldDescriptorProto::Label::LABEL_OPTIONAL
@@ -93,29 +93,29 @@ class DescriptorTest < Test::Unit::TestCase
     address_book_person_proto.name = 'person'
     address_book_person_proto.number = 1
 
-    Protobuf::Descriptor::DescriptorBuilder.build tutorial_proto
+    Protobuf::Descriptor::DescriptorBuilder.build(tutorial_proto)
 
     assert_nothing_raised {Build::Tutorial::Person}
     assert_nothing_raised {Build::Tutorial::Person.new}
-    assert_equal ['email', 'id', 'name', 'phone'], 
-      Build::Tutorial::Person.fields.map{|tag, field| field.name}.sort
+    assert_equal(['email', 'id', 'name', 'phone'],
+      Build::Tutorial::Person.fields.map{|tag, field| field.name}.sort)
 
     assert_nothing_raised {Build::Tutorial::Person::PhoneNumber}
     assert_nothing_raised {Build::Tutorial::Person::PhoneNumber.new}
-    assert_equal ['number', 'type'], 
-      Build::Tutorial::Person::PhoneNumber.fields.map{|tag, field| field.name}.sort
+    assert_equal(['number', 'type'],
+      Build::Tutorial::Person::PhoneNumber.fields.map{|tag, field| field.name}.sort)
 
     assert_nothing_raised {Build::Tutorial::Person::PhoneType}
-    assert_equal 0, Build::Tutorial::Person::PhoneType::MOBILE
-    assert_equal 1, Build::Tutorial::Person::PhoneType::HOME
-    assert_equal 2, Build::Tutorial::Person::PhoneType::WORK
+    assert_equal(0, Build::Tutorial::Person::PhoneType::MOBILE)
+    assert_equal(1, Build::Tutorial::Person::PhoneType::HOME)
+    assert_equal(2, Build::Tutorial::Person::PhoneType::WORK)
 
     assert_nothing_raised {Build::Tutorial::AddressBook}
   end
 
   def test_unbuild
-    proto = Protobuf::Descriptor::FileDescriptor.unbuild Tutorial::Person
-    proto.serialize_to_file 'person.bin'
+    proto = Protobuf::Descriptor::FileDescriptor.unbuild(Tutorial::Person)
+    proto.serialize_to_file('person.bin')
     puts
     puts "run `test/check_unbuild.rb'"
   end

data/test/test_enum_value.rb

@@ -0,0 +1,41 @@
+require 'test/unit'
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'test/proto/addressbook.pb'
+require 'test/proto/addressbook_base.pb'
+
+class EnumValueTest < Test::Unit::TestCase
+  def test_enum_value
+    e = Protobuf::EnumValue.new(Object, :name, 100)
+    assert_kind_of(Protobuf::EnumValue, e)
+    assert_equal(:name, e.name)
+    assert_equal(100, e.value)
+    assert_equal('name', e.to_s)
+    assert_equal('name', "#{e}")
+    assert(e == 100)
+    assert(100 == e)
+    assert(101, e + 1)
+    assert(101, 1 + e)
+  end
+
+  def test_enum_field_and_enum_value
+    phone_number = Tutorial::Person::PhoneNumber.new
+
+    assert_kind_of(Protobuf::EnumValue, phone_number.type)
+    assert_equal(Tutorial::Person::PhoneType::HOME, phone_number.type)
+
+    phone_number.type = 1
+    assert_kind_of(Protobuf::EnumValue, phone_number.type)
+    assert_equal(Tutorial::Person::PhoneType::HOME, phone_number.type)
+    assert_equal(1, phone_number.type)
+
+    phone_number.type = :HOME
+    assert_kind_of(Protobuf::EnumValue, phone_number.type)
+    assert_equal(Tutorial::Person::PhoneType::HOME, phone_number.type)
+    assert_equal(1, phone_number.type)
+
+    assert_raise(TypeError) do
+      phone_number.type = TutorialExt::Person::PhoneType::HOME
+    end
+  end
+end

data/test/test_extension.rb

@@ -1,16 +1,12 @@
 require 'test/unit'
-require 'test/addressbook_ext.rb'
+require 'test/proto/addressbook_ext.pb'
 
 class ExtensionTest < Test::Unit::TestCase
   def test_accessor
-    assert TutorialExt::Person.extension_fields.to_a.map{|t, f| f.name}.include?(:age)
+    assert(TutorialExt::Person.extension_fields.to_a.map{|t, f| f.name}.include?(:age))
     person = TutorialExt::Person.new
     assert_nothing_raised {person.age = 100}
-    assert 100, person.age
-    #assert 100, person.extension.age
-    #assert_nothing_raised {person.extension.age = 200}
-    #assert 200, person.age
-    #assert 200, person.extension.age
+    assert_equal(100, person.age)
   end
 
   def test_serialize
@@ -29,12 +25,12 @@ class ExtensionTest < Test::Unit::TestCase
     # parse the serialized string
     person2 = TutorialExt::Person.new
     person2.parse_from_string serialized_string
-    assert_equal 1234, person2.id
-    assert_equal 70, person2.age
-    assert_equal 'John Doe', person2.name
-    assert_equal 'jdoe@example.com', person2.email
-    assert_equal 1, person2.phone.size
-    assert_equal '555-4321', person2.phone[0].number
-    assert_equal TutorialExt::Person::PhoneType::HOME, person2.phone[0].type
+    assert_equal(1234, person2.id)
+    assert_equal(70, person2.age)
+    assert_equal('John Doe', person2.name)
+    assert_equal('jdoe@example.com', person2.email)
+    assert_equal(1, person2.phone.size)
+    assert_equal('555-4321', person2.phone[0].number)
+    assert_equal(TutorialExt::Person::PhoneType::HOME, person2.phone[0].type)
   end
 end

data/test/test_lowercase.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require 'test/proto/lowercase.pb'
+
+class LowercaseTest < Test::Unit::TestCase
+  def test_lowercase
+    message = nil
+    assert_nothing_raised { message = Test::Lowercase::Baaz.new }
+    assert_nothing_raised { message.x = Test::Lowercase::Foo::Bar.new }
+    assert_equal(Test::Lowercase::Foo::Bar, message.get_field_by_name(:x).type)
+  end
+end

data/test/test_message.rb

@@ -1,6 +1,6 @@
 require 'protobuf/message/message'
-require 'test/addressbook'
-require 'test/merge'
+require 'test/proto/addressbook.pb'
+require 'test/proto/merge.pb'
 require 'test/unit'
 
 # It should not conflict with Test::InnerMessage1 which is included in merge.proto
@@ -11,63 +11,63 @@ class MessageTest < Test::Unit::TestCase
     person1 = Tutorial::Person.new :name => 'ando'
     person2 = Tutorial::Person.new :name => 'ando'
     person3 = Tutorial::Person.new :name => 'Ando'
-    assert person1 == person2
-    assert person1 != person3
-    assert person1 != 'ando'
+    assert(person1 == person2)
+    assert(person1 != person3)
+    assert(person1 != 'ando')
   end
 
   def test_bracketed_access
     person = Tutorial::Person.new
     name_tag = 1
     person[name_tag] = 'Ichiro'
-    assert_equal 'Ichiro', person.name
-    assert_equal 'Ichiro', person[name_tag]
+    assert_equal('Ichiro', person.name)
+    assert_equal('Ichiro', person[name_tag])
 
     person[:id] = 100
-    assert_equal 100, person.id
+    assert_equal(100, person.id)
     person['id'] = 200
-    assert_equal 200, person.id
-    assert_equal 200, person[:id]
-    assert_equal 200, person['id']
+    assert_equal(200, person.id)
+    assert_equal(200, person[:id])
+    assert_equal(200, person['id'])
   end
 
   def test_initialize_with_hash
-    person = Tutorial::Person.new :name => 'Jiro', :id => 300, :email => 'jiro@ema.il'
-    assert_equal 'Jiro', person.name
-    assert_equal 300, person.id
-    assert_equal 'jiro@ema.il', person.email
+    person = Tutorial::Person.new(:name => 'Jiro', :id => 300, :email => 'jiro@ema.il')
+    assert_equal('Jiro', person.name)
+    assert_equal(300, person.id)
+    assert_equal('jiro@ema.il', person.email)
 
     # initialize with array of hash
     person = Tutorial::Person.new(:phone => [{:number => 'phone1'}, {:number => 'phone2'}])
-    assert_equal 'phone1', person.phone[0].number
-    assert_equal 'phone2', person.phone[1].number
+    assert_equal('phone1', person.phone[0].number)
+    assert_equal('phone2', person.phone[1].number)
 
     # initalize with hash in hash
     message = Test::MergeMessage.new(:require_message => { :name => 'name1', :repeate_message => [{:name => 'name2'}] })
-    assert_equal 'name1', message.require_message.name
-    assert_equal 'name2', message.require_message.repeate_message[0].name
+    assert_equal('name1', message.require_message.name)
+    assert_equal('name2', message.require_message.repeate_message[0].name)
 
     message.require_message = { :name => 'name21' }
     message.require_message.repeate_message = [ {:name => 'name22'} ]
-    assert_equal 'name21', message.require_message.name
-    assert_equal 'name22', message.require_message.repeate_message[0].name
-    assert_equal 1,        message.require_message.repeate_message.size
+    assert_equal('name21', message.require_message.name)
+    assert_equal('name22', message.require_message.repeate_message[0].name)
+    assert_equal(1,        message.require_message.repeate_message.size)
   end
 
   def test_defined_filenames
-    assert Tutorial::Person.defined_filenames
-    assert_equal 1, Tutorial::Person.defined_filenames.size
-    assert Tutorial::Person.defined_filenames.first =~ %r{/.*/test/addressbook\.rb}
+    assert(Tutorial::Person.defined_filenames)
+    assert_equal(1, Tutorial::Person.defined_filenames.size)
+    assert_match(%r{/.*/proto/addressbook\.pb\.rb}, Tutorial::Person.defined_filenames.first)
   end
 
   def test_proto_filenames
-    assert Tutorial::Person.proto_filenames
-    assert_equal 1, Tutorial::Person.proto_filenames.size
-    assert_equal 'test/addressbook.proto', Tutorial::Person.proto_filenames.first
+    assert(Tutorial::Person.proto_filenames)
+    assert_equal(1, Tutorial::Person.proto_filenames.size)
+    assert_equal('test/proto/addressbook.proto', Tutorial::Person.proto_filenames.first)
   end
 
   def test_proto_contents
-    assert_equal <<-eos.strip, Tutorial::Person.proto_contents.values.first.strip
+    assert_equal(<<-EOS.strip, Tutorial::Person.proto_contents.values.first.strip)
 package tutorial;
 
 message Person {
@@ -87,39 +87,42 @@ message Person {
   }
 
   repeated PhoneNumber phone = 4;
+  optional uint32 age = 5 [default = 20];
 
   extensions 100 to 200;
 }
 
+/*
 extend Person {
   optional int32 age = 100;
 }
+*/
 
 message AddressBook {
   repeated Person person = 1;
 }
-    eos
+    EOS
   end
 
   def test_merge_field
     inner_message1_2 = Test::MergeMessage::InnerMessage2.new(:name => 'name12')
     inner_message1_2.repeate_message << Test::MergeMessage::InnerMessage1.new(:name => 'name121')
-    message1 = Test::MergeMessage.new :name => 'name1', :require_message => inner_message1_2
+    message1 = Test::MergeMessage.new(:name => 'name1', :require_message => inner_message1_2)
     message1.repeate_message << Test::MergeMessage::InnerMessage1.new(:name => 'name11')
 
     inner_message2_2 = Test::MergeMessage::InnerMessage2.new(:name => 'name22')
     inner_message2_2.repeate_message << Test::MergeMessage::InnerMessage1.new(:name => 'name221')
-    message2 = Test::MergeMessage.new :name => 'name2', :require_message => inner_message2_2
+    message2 = Test::MergeMessage.new(:name => 'name2', :require_message => inner_message2_2)
     message2.repeate_message << Test::MergeMessage::InnerMessage1.new(:name => 'name21')
 
-    message1.merge_from message2
-    assert_equal 'name2', message1.name
-    assert_equal 2, message1.repeate_message.size
-    assert_equal 'name11', message1.repeate_message[0].name
-    assert_equal 'name21', message1.repeate_message[1].name
-    assert_equal 'name22', message1.require_message.name
-    assert_equal 2, message1.require_message.repeate_message.size
-    assert_equal 'name121', message1.require_message.repeate_message[0].name
-    assert_equal 'name221', message1.require_message.repeate_message[1].name
+    message1.merge_from(message2)
+    assert_equal('name2', message1.name)
+    assert_equal(2, message1.repeate_message.size)
+    assert_equal('name11', message1.repeate_message[0].name)
+    assert_equal('name21', message1.repeate_message[1].name)
+    assert_equal('name22', message1.require_message.name)
+    assert_equal(2, message1.require_message.repeate_message.size)
+    assert_equal('name121', message1.require_message.repeate_message[0].name)
+    assert_equal('name221', message1.require_message.repeate_message[1].name)
   end
 end