modify test for junoser-squash

Author: shogosanz

lib/junoser/squash.rb

@@ -45,15 +45,16 @@ class DeleteTransformer < Parslet::Transform
   end
 
   class Squash
-    def initialize(io)
-      @io = io
+    def initialize(io_or_string)
+      @input = io_or_string
       @lines = []
       @parser = Junoser::Parser.new
       @transformer = DeleteTransformer.new
     end
 
     def transform
-      while l = $<.gets
+      config = Junoser::Input.new(@input).read.split("\n")
+      config.each do |l|
         l.strip!
         case l
           when /^set /

test/test_junoser-squash.rb

@@ -1,6 +1,12 @@
-require 'junoser/squash'
+require 'pathname'
+
+$: << File.expand_path('../', Pathname.new(__FILE__).realpath)
 require 'helper'
 
+$: << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+require 'junoser/squash'
+
+
 class TestCommentLine < Test::Unit::TestCase
   config_subcommand = <<-EOS
 set interfaces em0 unit 0 family inet address 192.0.2.1/32
@@ -26,19 +32,17 @@ class TestCommentLine < Test::Unit::TestCase
   # config_squash
 
   test 'check subcommand function' do
-    assert_equal(<<-EOS,Junoser::Squash.new(config_subcommand).transform)
-set interfaces em0 unit 0 family inet address 192.0.2.1/32
+    assert_equal('set interfaces em0 unit 0 family inet address 192.0.2.1/32
 set interfaces em100 unit 0 family inet
-set interfaces em100 unit 0 family inet address 192.0.2.1/32
-EOS
+set interfaces em100 unit 0 family inet address 192.0.2.1/32',Junoser::Squash.new(config_subcommand).transform)
+
   end
 
   test 'check delete function' do
-    assert_equal(<<-EOS,Junoser::Squash.new(config_delete).transform)
-set interfaces em0 unit 0 family inet address 192.0.2.0/32
+    assert_equal('set interfaces em0 unit 0 family inet address 192.0.2.0/32
 set interfaces em10
 set interfaces em10 unit 20
-set interfaces em100 unit 100 family inet address 192.0.2.0/32
-EOS
+set interfaces em100 unit 100 family inet address 192.0.2.0/32',Junoser::Squash.new(config_delete).transform)
+
   end
 end