test/config/test_dsl.rb in fluentd-1.2.2 vs test/config/test_dsl.rb in fluentd-1.2.3

@@ -174,24 +174,24 @@
           ele4 = @root.elements.first.elements[4]
 
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
         test 'makes user-defined sections with blocks' do
           filter0 = @root.elements.first.elements[4].elements.first
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
           assert_equal('bar', filter0.elements[0]['foo'])
           assert_equal('subsection', filter0.elements[1].name)
@@ -201,11 +201,11 @@
         test 'makes values with user-assigned variable substitutions' do
           match0 = @root.elements.first.elements[4].elements.last
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end
     end
 
@@ -300,24 +300,24 @@
           ele4 = @root.elements.first.elements[4]
 
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
         test 'makes user-defined sections with blocks' do
           filter0 = @root.elements.first.elements[4].elements.first
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
           assert_equal('bar', filter0.elements[0]['foo'])
           assert_equal('subsection', filter0.elements[1].name)
@@ -327,10 +327,10 @@
         test 'makes values with user-assigned variable substitutions' do
           match0 = @root.elements.first.elements[4].elements.last
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end
     end