Changeset 98

Timestamp:

11/09/07 02:45:49 (4 years ago)

Author:

cs186

Message:

Code coverage complete for librarymaps_controller

Location:

hw/hw4/library

Files:

• app/controllers/librarymaps_controller.rb (modified) (4 diffs)
• test/functional/librarymaps_controller_test.rb (modified) (1 diff)

hw/hw4/library/app/controllers/librarymaps_controller.rb

@@ -36 +36 @@
     if geoloc.status != Geocoding::GEO_SUCCESS
       err = 'Library Coordinates Not Found'
-      return err
+      raise err
     end
     liblatlon = geoloc[0].latlon
@@ -117 +117 @@
 #  formula = options[:formula] || GeoKit::default_formula
   units = :miles
-  formula = :sphere
-  case formula
-  when :sphere          
+#  formula = :sphere
+#  case formula
+#  when :sphere          
     units_sphere_multiplier(units) * 
       Math.acos( Math.sin(deg2rad(from[0])) * Math.sin(deg2rad(to[0])) + 
                  Math.cos(deg2rad(from[0])) * Math.cos(deg2rad(to[0])) * 
                  Math.cos(deg2rad(to[1]) - deg2rad(from[1])))   
-  when :flat
-    Math.sqrt((units_per_latitude_degree(units)*(from[0]-to[0]))**2 + 
-              (units_per_longitude_degree(from[0], units)*(from[1]-to[1]))**2)
-  end
+#  when :flat
+#    Math.sqrt((units_per_latitude_degree(units)*(from[0]-to[0]))**2 + 
+#              (units_per_longitude_degree(from[0], units)*(from[1]-to[1]))**2)
+#  end
 end
 
@@ -134 +134 @@
 end
 
-def rad2deg(rad)
-  rad.to_f * 180.0 / Math::PI 
-end
+# def rad2deg(rad)
+#  rad.to_f * 180.0 / Math::PI 
+# end
 
-def to_heading(rad)
-  (rad2deg(rad)+360)%360
-end
+# def to_heading(rad)
+#  (rad2deg(rad)+360)%360
+# end
 
 # Returns the multiplier used to obtain the correct distance units.
@@ -148 +148 @@
 
 # Returns the number of units per latitude degree.
-def units_per_latitude_degree(units)
-  units == :miles ? MILES_PER_LATITUDE_DEGREE : KMS_PER_LATITUDE_DEGREE
-end
+# def units_per_latitude_degree(units)
+#   units == :miles ? MILES_PER_LATITUDE_DEGREE : KMS_PER_LATITUDE_DEGREE
+# end
 
 # Returns the number units per longitude degree.
-def units_per_longitude_degree(lat, units)
-  miles_per_longitude_degree = (LATITUDE_DEGREES * Math.cos(lat * PI_DIV_RAD)).abs
-  units == :miles ? miles_per_longitude_degree : miles_per_longitude_degree * KMS_PER_MILE
-end  
+# def units_per_longitude_degree(lat, units)
+#   miles_per_longitude_degree = (LATITUDE_DEGREES * Math.cos(lat * PI_DIV_RAD)).abs
+#   units == :miles ? miles_per_longitude_degree : miles_per_longitude_degree * KMS_PER_MILE
+# end  

hw/hw4/library/test/functional/librarymaps_controller_test.rb

@@ -13 +13 @@
 
   # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_index
+    get :index, :changelibrary => {:newlibrary=>'Gustav Library'}
+    assert_response :success 
+  end
+
+  def test_bad_geoloc
+    l = Library.new
+    l.city = "Hellerstein"
+    l.lname = "Nothing Library"
+    l.save
+    assert_raises(RuntimeError) do
+      get :index, :changelibrary => {:newlibrary=>'Nothing Library'}
+    end
   end
 end