[Groonga-commit] groonga/groonga [master] test: move get_filename definition into GrnTestData

Back to archive index

null+****@clear***** null+****@clear*****
2012年 5月 16日 (水) 14:47:09 JST


HAYASHI Kentaro	2012-05-16 14:47:09 +0900 (Wed, 16 May 2012)

  New Revision: 4b8e75274c7f7532711666fd29183a75279be22a

  Log:
    test: move get_filename definition into GrnTestData

  Modified files:
    test/function/tools/geo/generate-grntest-data.rb

  Modified: test/function/tools/geo/generate-grntest-data.rb (+10 -11)
===================================================================
--- test/function/tools/geo/generate-grntest-data.rb    2012-05-16 14:44:24 +0900 (3e493b5)
+++ test/function/tools/geo/generate-grntest-data.rb    2012-05-16 14:47:09 +0900 (a269ffa)
@@ -136,6 +136,15 @@ class GrnTestData
     start_longitude == end_longitude and start_latitude == end_latitude
   end
 
+  def generate_filename
+    s = get_point(@longitude_start_degree, @latitude_start_degree)
+    e = get_point(@longitude_end_degree, @latitude_end_degree)
+    if s == e
+      "#{s}.test"
+    else
+      "#{s}_to_#{e}.test"
+    end
+  end
 end
 
 
@@ -232,16 +241,6 @@ def get_point(lng, lat)
   end
 end
 
-def get_filename(start_lng, start_lat, end_lng, end_lat)
-  s = get_point(start_lng, start_lat)
-  e = get_point(end_lng, end_lat)
-  if s == e
-    ret = "#{s}.test"
-  else
-    ret = "#{s}_to_#{e}.test"
-  end
-  ret
-end
 
 
 
@@ -292,7 +291,7 @@ if __FILE__ == $0
       type = grndata.point_or_line
 
       if OPTS.has_key?(:file_name)
-        filename = get_filename(lng_sdeg, lat_sdeg, lng_edeg, lat_edeg)
+        filename = grndata.generate_filename
 
         puts "#{line.chomp}"
         # show new generated filename




Groonga-commit メーリングリストの案内
Back to archive index