Fix triangle sides showing up in test name

Author: jdel7

exercises/triangle/.meta/generator/triangle_case.rb

@@ -24,11 +24,19 @@ def indent(line)
   end
 
   def failure_message
-    %Q("Expected '#{expected}', #{expected_type}.")
+    %Q("Expected '#{expected}', #{expected_triangle}.")
   end
 
   def expected_type
-    "triangle #{sides} is #{expected ? '' : 'not '}#{property}"
+    "triangle is #{type}"
+  end
+
+  def expected_triangle
+    "triangle #{sides} is #{type}"
+  end
+
+  def type
+    "#{expected ? '' : 'not ' }#{property}"
   end
 
 end

exercises/triangle/triangle_test.rb

@@ -4,19 +4,19 @@
 
 # Common test data version: 1.0.0 fa90b35
 class TriangleTest < Minitest::Test
-  def test_triangle_[2_2_2]_is_equilateral_if_all_sides_are_equal
+  def test_triangle_is_equilateral_if_all_sides_are_equal
     # skip
     triangle = Triangle.new([2, 2, 2])
     assert triangle.equilateral?, "Expected 'true', triangle [2, 2, 2] is equilateral."
   end
 
-  def test_triangle_[2_3_2]_is_not_equilateral_if_any_side_is_unequal
+  def test_triangle_is_not_equilateral_if_any_side_is_unequal
     skip
     triangle = Triangle.new([2, 3, 2])
     refute triangle.equilateral?, "Expected 'false', triangle [2, 3, 2] is not equilateral."
   end
 
-  def test_triangle_[5_4_6]_is_not_equilateral_if_no_sides_are_equal
+  def test_triangle_is_not_equilateral_if_no_sides_are_equal
     skip
     triangle = Triangle.new([5, 4, 6])
     refute triangle.equilateral?, "Expected 'false', triangle [5, 4, 6] is not equilateral."
@@ -34,19 +34,19 @@ def test_equilateral_triangle_sides_may_be_floats
     assert triangle.equilateral?, "Expected 'true', triangle [0.5, 0.5, 0.5] is equilateral."
   end
 
-  def test_triangle_[3_4_4]_is_isosceles_if_last_two_sides_are_equal
+  def test_triangle_is_isosceles_if_last_two_sides_are_equal
     skip
     triangle = Triangle.new([3, 4, 4])
     assert triangle.isosceles?, "Expected 'true', triangle [3, 4, 4] is isosceles."
   end
 
-  def test_triangle_[4_4_3]_is_isosceles_if_first_two_sides_are_equal
+  def test_triangle_is_isosceles_if_first_two_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 3])
     assert triangle.isosceles?, "Expected 'true', triangle [4, 4, 3] is isosceles."
   end
 
-  def test_triangle_[4_3_4]_is_isosceles_if_first_and_last_sides_are_equal
+  def test_triangle_is_isosceles_if_first_and_last_sides_are_equal
     skip
     triangle = Triangle.new([4, 3, 4])
     assert triangle.isosceles?, "Expected 'true', triangle [4, 3, 4] is isosceles."
@@ -58,7 +58,7 @@ def test_equilateral_triangles_are_also_isosceles
     assert triangle.isosceles?, "Expected 'true', triangle [4, 4, 4] is isosceles."
   end
 
-  def test_triangle_[2_3_4]_is_not_isosceles_if_no_sides_are_equal
+  def test_triangle_is_not_isosceles_if_no_sides_are_equal
     skip
     triangle = Triangle.new([2, 3, 4])
     refute triangle.isosceles?, "Expected 'false', triangle [2, 3, 4] is not isosceles."
@@ -76,19 +76,19 @@ def test_isosceles_triangle_sides_may_be_floats
     assert triangle.isosceles?, "Expected 'true', triangle [0.5, 0.4, 0.5] is isosceles."
   end
 
-  def test_triangle_[5_4_6]_is_scalene_if_no_sides_are_equal
+  def test_triangle_is_scalene_if_no_sides_are_equal
     skip
     triangle = Triangle.new([5, 4, 6])
     assert triangle.scalene?, "Expected 'true', triangle [5, 4, 6] is scalene."
   end
 
-  def test_triangle_[4_4_4]_is_not_scalene_if_all_sides_are_equal
+  def test_triangle_is_not_scalene_if_all_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 4])
     refute triangle.scalene?, "Expected 'false', triangle [4, 4, 4] is not scalene."
   end
 
-  def test_triangle_[4_4_3]_is_not_scalene_if_two_sides_are_equal
+  def test_triangle_is_not_scalene_if_two_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 3])
     refute triangle.scalene?, "Expected 'false', triangle [4, 4, 3] is not scalene."