thinreports 0.7.7 → 0.8.0

data/test/unit/core/shape/page_number/test_format.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::PageNumber::TestFormat < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::PageNumber::TestFormat < Minitest::Test
+  include Thinreports::TestHelper
 
   TEST_PAGENO_FORMAT = {
     "type" => "s-pageno", 
@@ -37,7 +37,7 @@ class ThinReports::Core::Shape::PageNumber::TestFormat < MiniTest::Unit::TestCas
     }
   }
 
-  Format = ThinReports::Core::Shape::PageNumber::Format
+  Format = Thinreports::Core::Shape::PageNumber::Format
 
   def format(raw_format = nil)
     Format.new(raw_format || TEST_PAGENO_FORMAT)

data/test/unit/core/shape/page_number/test_interface.rb

@@ -1,18 +1,21 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::PageNumber::TestInterface < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::PageNumber::TestInterface < Minitest::Test
+  include Thinreports::TestHelper
 
-  PageNumber = ThinReports::Core::Shape::PageNumber
+  PageNumber = Thinreports::Core::Shape::PageNumber
 
-  def init_pageno(format = {})
-    PageNumber::Interface.new(flexmock('parent'), PageNumber::Format.new(format))
+  def create_pageno(format = {})
+    report = new_report 'layout_text1'
+    parent = report.start_new_page
+
+    PageNumber::Interface.new parent, PageNumber::Format.new(format)
   end
 
   def test_format
-    pageno = init_pageno('format' => '{page}')
+    pageno = create_pageno 'format' => '{page}'
 
     assert_equal pageno.format, '{page}'
     pageno.format('{page} / {total}')
@@ -20,7 +23,7 @@ class ThinReports::Core::Shape::PageNumber::TestInterface < MiniTest::Unit::Test
   end
 
   def test_reset_format
-    pageno = init_pageno('format' => '{page}')
+    pageno = create_pageno 'format' => '{page}'
 
     pageno.format('-- {page} --')
     pageno.reset_format

data/test/unit/core/shape/page_number/test_internal.rb

@@ -1,14 +1,14 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::PageNumber::TestInternal < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::PageNumber::TestInternal < Minitest::Test
+  include Thinreports::TestHelper
 
-  PageNumber = ThinReports::Core::Shape::PageNumber
+  PageNumber = Thinreports::Core::Shape::PageNumber
 
   def setup
-    @report = create_basic_report('basic_layout1.tlf')
+    @report = new_report('layout_text1.tlf')
     @report.start_new_page
   end
 

data/test/unit/core/shape/styles/test_base.rb

@@ -1,15 +1,15 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::Style::TestBase < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::Style::TestBase < Minitest::Test
+  include Thinreports::TestHelper
   
   # Alias
-  Style = ThinReports::Core::Shape::Style::Base
+  Style = Thinreports::Core::Shape::Style::Base
   
   def create_basic_format(attrs = {})
-    ThinReports::Core::Shape::Basic::Format.new('svg' => {'attrs' => attrs})
+    Thinreports::Core::Shape::Basic::Format.new('svg' => {'attrs' => attrs})
   end
   
   def create_style(base = {})
@@ -178,17 +178,17 @@ class ThinReports::Core::Shape::Style::TestBase < MiniTest::Unit::TestCase
   end
   
   def test_reader_method_caller_should_raise_when_style_is_not_accessible
-    assert_raises ThinReports::Errors::UnknownShapeStyleName do
+    assert_raises Thinreports::Errors::UnknownShapeStyleName do
       create_new_style[:unknown]
     end
   end
   
   def test_writer_method_caller_should_raise_when_style_is_not_accessible
-    assert_raises ThinReports::Errors::UnknownShapeStyleName do
+    assert_raises Thinreports::Errors::UnknownShapeStyleName do
       create_new_style[:unknown] = 'value'
     end
   end
-  
+
   def test_copy_should_return_the_instance_of_the_same_class_as_itself
     style = create_style
     assert_instance_of Style, style.copy
@@ -216,4 +216,4 @@ class ThinReports::Core::Shape::Style::TestBase < MiniTest::Unit::TestCase
     
     assert_equal style.identifier, style.styles.hash.to_s
   end
-end
+end

data/test/unit/core/shape/styles/test_basic.rb

@@ -1,13 +1,13 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::Style::TestBasic < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::Style::TestBasic < Minitest::Test
+  include Thinreports::TestHelper
   
   def create_basic_style(format_config = {})
-    format = ThinReports::Core::Shape::Basic::Format.new(format_config)
-    ThinReports::Core::Shape::Style::Basic.new(format)
+    format = Thinreports::Core::Shape::Basic::Format.new(format_config)
+    Thinreports::Core::Shape::Style::Basic.new(format)
   end
   
   def test_visible_should_return_visibility_of_format_as_default

data/test/unit/core/shape/styles/test_graphic.rb

@@ -1,69 +1,55 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
+
+class Thinreports::Core::Shape::Style::TestGraphic < Minitest::Test
+  include Thinreports::TestHelper
 
-class ThinReports::Core::Shape::Style::TestGraphic < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
-  
   def create_graphic_style
-    format = ThinReports::Core::Shape::Basic::Format.new({})
-    ThinReports::Core::Shape::Style::Graphic.new(format)
+    format = Thinreports::Core::Shape::Basic::Format.new({})
+    Thinreports::Core::Shape::Style::Graphic.new(format)
   end
-  
+
   def test_border_color_should_properly_set_to_internal_styles_as_stroke_style
     style = create_graphic_style
     style.border_color = '#ff0000'
-    
+
     assert_equal style.styles['stroke'], '#ff0000'
   end
-  
+
   def test_border_width_should_properly_set_to_internal_styles_as_stroke_width_style
     style = create_graphic_style
     style.border_width = 1
-    
+
     assert_equal style.styles['stroke-width'], 1
   end
-  
+
   def test_border_width_should_set_stroke_opacity_to_1_when_width_is_not_zero
     style = create_graphic_style
     style.border_width = 5
-    
+
     assert_equal style.styles['stroke-opacity'], '1'
   end
-  
+
   def test_fill_color_should_properly_set_to_internal_styles_as_fill_style
     style = create_graphic_style
     style.fill_color = '#0000ff'
-    
+
     assert_equal style.styles['fill'], '#0000ff'
   end
-  
-  def test_fill_should_operate_like_the_fill_color_method
-    style = create_graphic_style
-    style.fill = '#ff0000'
-    
-    assert_same style.fill_color, style.fill
-  end
-  
-  def test_stroke_should_operate_like_the_border_width_method
-    style = create_graphic_style
-    style.stroke = 5
-    
-    assert_same style.border_width, style.stroke
-  end
-  
+
   def test_border_should_return_an_Array_included_border_width_and_border_color
     style = create_graphic_style
     style.border_width = 1
     style.border_color = '#ff0000'
-    
+
     assert_equal style.border, [style.border_width, style.border_color]
   end
-  
+
   def test_border_should_properly_set_both_border_width_and_border_color_from_the_specified_array_argument
     style = create_graphic_style
     style.border = [5, '#000000']
-    
+
     assert_equal style.border, [5, '#000000']
   end
-end
+end

data/test/unit/core/shape/styles/test_text.rb

@@ -1,17 +1,28 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::Style::TestText < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::Style::TestText < Minitest::Test
+  include Thinreports::TestHelper
   
   def create_format(format = {})
-    ThinReports::Core::Shape::Text::Format.new(format)
+    Thinreports::Core::Shape::Text::Format.new(format)
   end
   
   def create_text_style(format = nil)
     format ||= create_format
-    ThinReports::Core::Shape::Style::Text.new(format)
+    Thinreports::Core::Shape::Style::Text.new(format)
+  end
+
+  def test_font_size
+    format = create_format('svg' => {'attrs' => {'font-size' => '12'}})
+    style  = create_text_style(format)
+
+    assert_equal style.font_size, '12'
+
+    style.font_size = 19
+
+    assert_equal style.styles['font-size'], 19
   end
 
   def test_bold_should_return_true_when_font_weight_property_of_format_is_bold
@@ -304,7 +315,7 @@ class ThinReports::Core::Shape::Style::TestText < MiniTest::Unit::TestCase
   end
 
   def test_initialize
-    klass = Class.new(ThinReports::Core::Shape::Style::Text)
+    klass = Class.new(Thinreports::Core::Shape::Style::Text)
     klass.class_eval do
       accessible_styles.delete(:valign)
     end
@@ -326,4 +337,4 @@ class ThinReports::Core::Shape::Style::TestText < MiniTest::Unit::TestCase
     assert_equal style.identifier,
                  style.send(:create_identifier, style.styles) + 'bottom'
   end
-end
+end

data/test/unit/core/shape/text/test_format.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::Text::TestFormat < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::Text::TestFormat < Minitest::Test
+  include Thinreports::TestHelper
 
   TEST_TEXT_FORMAT = {
     "type" => "s-text",
@@ -44,14 +44,14 @@ class ThinReports::Core::Shape::Text::TestFormat < MiniTest::Unit::TestCase
   }
 
   # Alias
-  Format = ThinReports::Core::Shape::Text::Format
+  Format = Thinreports::Core::Shape::Text::Format
 
   def test_build_format
     build_format
   rescue => e
     flunk exception_details(e, 'Building failed.')
   end
-  
+
   def test_config_readers
     format = Format.new(TEST_TEXT_FORMAT)
     
@@ -70,4 +70,4 @@ class ThinReports::Core::Shape::Text::TestFormat < MiniTest::Unit::TestCase
   def build_format
     Format.build(TEST_TEXT_FORMAT)
   end
-end
+end

data/test/unit/core/shape/text/test_internal.rb

@@ -1,21 +1,20 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::Text::TestInternal < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::Text::TestInternal < Minitest::Test
+  include Thinreports::TestHelper
   
-  Text = ThinReports::Core::Shape::Text
+  Text = Thinreports::Core::Shape::Text
   
-  def setup
-    format = flexmock('format')
-    format.should_receive(:type => 's-text')
-    
-    @internal = Text::Internal.new(flexmock('parent'), format)
+  def create_internal(format_config = {})
+    report = new_report('layout_text1.tlf')
+    Text::Internal.new(report.start_new_page, Text::Format.new(format_config))
   end
   
   def test_type_of?
-    assert_equal @internal.type_of?(:text), true
-    assert_equal @internal.type_of?(:basic), false
+    assert create_internal.type_of?(:text), true
+    refute create_internal.type_of?(:basic), false
   end
-end
+
+end

data/test/unit/core/shape/text_block/formatter/test_basic.rb

@@ -1,24 +1,24 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
+
+class Thinreports::Core::Shape::TextBlock::Formatter::TestBasic < Minitest::Test
+  include Thinreports::TestHelper
 
-class ThinReports::Core::Shape::TextBlock::Formatter::TestBasic < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
-  
   # Alias
-  Formatter = ThinReports::Core::Shape::TextBlock::Formatter::Basic
-  
+  Formatter = Thinreports::Core::Shape::TextBlock::Formatter::Basic
+
   def test_apply_simple_format
-    format = flexmock(:format_base => 'Hello {value}!')
-    
-    assert_equal Formatter.new(format).apply('ThinReports'),
-                 'Hello ThinReports!'
+    format = stub(format_base: 'Hello {value}!')
+
+    assert_equal Formatter.new(format).apply('Thinreports'),
+                 'Hello Thinreports!'
   end
-  
+
   def test_apply_multiple_format
-    format = flexmock(:format_base => 'Hello {value}! And good bye {value}.')
-    
-    assert_equal Formatter.new(format).apply('ThinReports'),
-                 'Hello ThinReports! And good bye ThinReports.'
+    format = stub(format_base: 'Hello {value}! And good bye {value}.')
+
+    assert_equal Formatter.new(format).apply('Thinreports'),
+                 'Hello Thinreports! And good bye Thinreports.'
   end
-end
+end

data/test/unit/core/shape/text_block/formatter/test_datetime.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
 
-class ThinReports::Core::Shape::TextBlock::Formatter::TestDatetime < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
+class Thinreports::Core::Shape::TextBlock::Formatter::TestDatetime < Minitest::Test
+  include Thinreports::TestHelper
   
   # Aliases
-  TextBlock = ThinReports::Core::Shape::TextBlock
+  TextBlock = Thinreports::Core::Shape::TextBlock
   Formatter = TextBlock::Formatter::Datetime
   
   def setup

data/test/unit/core/shape/text_block/formatter/test_number.rb

@@ -1,24 +1,24 @@
 # coding: utf-8
 
-require 'test/unit/helper'
+require 'test_helper'
+
+class Thinreports::Core::Shape::TextBlock::Formatter::TestNumber < Minitest::Test
+  include Thinreports::TestHelper
 
-class ThinReports::Core::Shape::TextBlock::Formatter::TestNumber < MiniTest::Unit::TestCase
-  include ThinReports::TestHelpers
-  
   # Alias
-  Formatter = ThinReports::Core::Shape::TextBlock::Formatter::Number
-  
+  Formatter = Thinreports::Core::Shape::TextBlock::Formatter::Number
+
   def init_formatter(expect_formats)
-    format = flexmock({:format_base => '',
-                       :format_number_precision => nil,
-                       :format_number_delimiter => nil}.merge(expect_formats))
+    format = stub({ format_base: '',
+                    format_number_precision: nil,
+                    format_number_delimiter: nil }.merge(expect_formats))
     Formatter.new(format)
   end
-  
+
   def test_apply_precision_formats
     # When precision is 2
-    formatter = init_formatter(:format_number_precision => 2)
-    
+    formatter = init_formatter(format_number_precision: 2)
+
     assert_equal formatter.apply(1.005), '1.01'
     assert_equal formatter.apply(1.004), '1.00'
     assert_equal formatter.apply(1), '1.00'
@@ -28,49 +28,49 @@ class ThinReports::Core::Shape::TextBlock::Formatter::TestNumber < MiniTest::Uni
     assert_equal formatter.apply('9'), '9.00'
     # Cannot apply, Return the raw value
     assert_equal formatter.apply('invalid value'), 'invalid value'
-    
+
     # When precision is 0
-    formatter = init_formatter(:format_number_precision => 0)
-    
+    formatter = init_formatter(format_number_precision: 0)
+
     assert_equal formatter.apply(1.5), '2'
   end
-  
+
   def test_apply_precision_format_with_basic_format
-    formatter = init_formatter(:format_base => '$ {value}',
-                               :format_number_precision => 0)
-    
+    formatter = init_formatter(format_base: '$ {value}',
+                               format_number_precision: 0)
+
     assert_equal formatter.apply(199.5), '$ 200'
   end
-  
+
   def test_apply_delimiter_formats
     # When delimiter is ','
-    formatter = init_formatter(:format_number_delimiter => ',')
-    
+    formatter = init_formatter(format_number_delimiter: ',')
+
     assert_equal formatter.apply(1000000), '1,000,000'
     assert_equal formatter.apply(-1000000), '-1,000,000'
     assert_equal formatter.apply('1000.0'), '1,000.0'
     assert_equal formatter.apply('-1000.0'), '-1,000.0'
     # Cannot apply, Return the raw value
     assert_equal formatter.apply('invalid value'), 'invalid value'
-    
+
     # When delimiter is whitespace
-    formatter = init_formatter(:format_number_delimiter => ' ')
-    
+    formatter = init_formatter(format_number_delimiter: ' ')
+
     assert_equal formatter.apply(99999), '99 999'
   end
-  
+
   def test_apply_delimiter_format_with_basic_format
-    formatter = init_formatter(:format_base => '￥{value}',
-                               :format_number_delimiter => ',')
-    
+    formatter = init_formatter(format_base: '￥{value}',
+                               format_number_delimiter: ',')
+
     assert_equal formatter.apply(199800), '￥199,800'
   end
-  
+
   def test_apply_all_format
-    formatter = init_formatter(:format_base => '-- {value} --',
-                               :format_number_delimiter => ',',
-                               :format_number_precision => 2)
+    formatter = init_formatter(format_base: '-- {value} --',
+                               format_number_delimiter: ',',
+                               format_number_precision: 2)
 
     assert_equal formatter.apply(95618.88567), '-- 95,618.89 --'
   end
-end
+end