trackler 2.2.1.19 → 2.2.1.20

data/tracks/ruby/exercises/hamming/hamming_test.rb

@@ -1,10 +1,15 @@
 require 'minitest/autorun'
 require_relative 'hamming'
 
-# Common test data version: 1.0.0 bb56dc7
+# Common test data version: 2.0.0 a2aff5b
 class HammingTest < Minitest::Test
-  def test_identical_strands
+  def test_empty_strands
     # skip
+    assert_equal 0, Hamming.compute('', '')
+  end
+
+  def test_identical_strands
+    skip
     assert_equal 0, Hamming.compute('A', 'A')
   end
 
@@ -63,11 +68,6 @@ class HammingTest < Minitest::Test
     assert_equal 9, Hamming.compute('GGACGGATTCTG', 'AGGACGGATTCT')
   end
 
-  def test_empty_strands
-    skip
-    assert_equal 0, Hamming.compute('', '')
-  end
-
   def test_disallow_first_strand_longer
     skip
     assert_raises(ArgumentError) { Hamming.compute('AATG', 'AAA') }

data/tracks/ruby/exercises/leap/.meta/generator/test_template.erb

@@ -19,7 +19,7 @@ class YearTest < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/exercises/pangram/.meta/.version

@@ -1 +1 @@
-4
+5

data/tracks/ruby/exercises/pangram/.meta/solutions/pangram.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 4
+  VERSION = 5
 end
 
 class Pangram

data/tracks/ruby/exercises/pangram/pangram_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'pangram'
 
-# Common test data version: 1.0.0 f375051
+# Common test data version: 1.1.0 fba1aef
 class PangramTest < Minitest::Test
   def test_sentence_empty
     # skip
@@ -61,7 +61,7 @@ class PangramTest < Minitest::Test
 
   def test_upper_and_lower_case_versions_of_the_same_character_should_not_be_counted_separately
     skip
-    phrase = 'the quick brown fox jumped over the lazy FOX'
+    phrase = 'the quick brown fox jumps over with lazy FX'
     result = Pangram.pangram?(phrase)
     refute result, "Expected false, got: #{result.inspect}. #{phrase.inspect} is NOT a pangram"
   end
@@ -85,6 +85,6 @@ class PangramTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 4, BookKeeping::VERSION
+    assert_equal 5, BookKeeping::VERSION
   end
 end

data/tracks/ruby/exercises/rna-transcription/rna_transcription_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'rna_transcription'
 
-# Common test data version: 1.0.0 0b20fff
+# Common test data version: 1.0.1 cb1fd3a
 class RnaTranscriptionTest < Minitest::Test
   def test_rna_complement_of_cytosine_is_guanine
     # skip
@@ -28,17 +28,17 @@ class RnaTranscriptionTest < Minitest::Test
     assert_equal 'UGCACCAGAAUU', Complement.of_dna('ACGTGGTCTTAA')
   end
 
-  def test_dna_correctly_handles_invalid_input
+  def test_correctly_handles_invalid_input_rna_instead_of_dna
     skip
     assert_equal '', Complement.of_dna('U')
   end
 
-  def test_dna_correctly_handles_completely_invalid_input
+  def test_correctly_handles_completely_invalid_dna_input
     skip
     assert_equal '', Complement.of_dna('XXX')
   end
 
-  def test_dna_correctly_handles_partially_invalid_input
+  def test_correctly_handles_partially_invalid_dna_input
     skip
     assert_equal '', Complement.of_dna('ACGTXXXCTTAA')
   end

data/tracks/ruby/exercises/roman-numerals/.meta/solutions/roman_numerals.rb

@@ -2,7 +2,7 @@ module BookKeeping
   VERSION = 2
 end
 
-class Fixnum
+class Integer
   def to_roman
     i = self
     s = ''

data/tracks/ruby/exercises/space-age/.meta/generator/test_template.erb

@@ -15,7 +15,7 @@ class <%= exercise_name_camel %>Test < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/lib/generator/test_template.erb

@@ -10,7 +10,7 @@ class <%= exercise_name_camel %>Test < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/lib/generator/underscore.rb

@@ -10,7 +10,7 @@ module Generator
       end
     end
 
-    refine Fixnum do
+    refine Integer do
       def underscore
         self.to_s.reverse.gsub(/...(?=.)/, '\&_').reverse
       end

data/tracks/ruby/lib/helper.rb

@@ -1,5 +1,5 @@
-XRUBY_ROOT = File.join(File.dirname(__FILE__), '..').freeze
-XRUBY_LIB = File.join(XRUBY_ROOT, 'lib').freeze
-METADATA_REPOSITORY_PATH = File.join(XRUBY_ROOT, '..', 'problem-specifications').freeze
+EXERCISM_RUBY_ROOT = File.join(File.dirname(__FILE__), '..').freeze
+EXERCISM_RUBY_LIB = File.join(EXERCISM_RUBY_ROOT, 'lib').freeze
+METADATA_REPOSITORY_PATH = File.join(EXERCISM_RUBY_ROOT, '..', 'problem-specifications').freeze
 
-$LOAD_PATH.unshift(XRUBY_LIB)
+$LOAD_PATH.unshift(EXERCISM_RUBY_LIB)

data/tracks/ruby/test/fixtures/{xruby → ruby}/exercises/alpha-beta/.meta/generator/test_template.erb

@@ -10,7 +10,7 @@ class AlphaBetaTest < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/test/fixtures/{xruby → ruby}/exercises/alpha/.meta/generator/test_template.erb

@@ -12,7 +12,7 @@ class <%= exercise_name_camel %>Test < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/test/fixtures/{xruby → ruby}/lib/generator/test_template.erb

@@ -10,7 +10,7 @@ class <%= exercise_name_camel %>Test < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/test/generator/files/track_files_test.rb

@@ -5,7 +5,7 @@ module Generator
     class TrackFilesTest < Minitest::Test
       FixturePaths = Paths.new(
         metadata: 'test/fixtures/metadata',
-        track: 'test/fixtures/xruby'
+        track: 'test/fixtures/ruby'
       )
 
       class TestTrackFiles
@@ -69,7 +69,7 @@ module Generator
       end
 
       def test_increment
-        subject = TestTestsVersionFile.new(filename: 'test/fixtures/xruby/exercises/alpha/.meta/.version')
+        subject = TestTestsVersionFile.new(filename: 'test/fixtures/ruby/exercises/alpha/.meta/.version')
         assert_equal 2, subject.increment
       end
     end
@@ -83,7 +83,7 @@ module Generator
 
       def test_update_version
         subject = TestExampleSolutionFile.new(
-          filename: 'test/fixtures/xruby/exercises/alpha/.meta/solutions/alpha.rb'
+          filename: 'test/fixtures/ruby/exercises/alpha/.meta/solutions/alpha.rb'
         )
         assert_match(/VERSION = 2/, subject.update_version(2))
       end
@@ -103,7 +103,7 @@ module Generator
         mock_erb = Minitest::Mock.new
         mock_erb.expect :result, 'new content', ['mock binding']
 
-        subject = TestMinitestTestsFile.new(filename: 'test/fixtures/xruby/exercises/alpha/alpha_tests.rb')
+        subject = TestMinitestTestsFile.new(filename: 'test/fixtures/ruby/exercises/alpha/alpha_tests.rb')
         ERB.stub :new, mock_erb do
           assert_equal 'new content', subject.generate(template: mock_template, values: mock_values)
         end

data/tracks/ruby/test/generator/implementation_test.rb

@@ -4,7 +4,7 @@ module Generator
   class ImplementationTest < Minitest::Test
     FixturePaths = Paths.new(
       metadata: 'test/fixtures/metadata',
-      track: 'test/fixtures/xruby'
+      track: 'test/fixtures/ruby'
     )
 
     def test_version

data/tracks/ruby/test/generator/template_values_test.rb

@@ -63,7 +63,7 @@ module Generator
       end
 
       def test_case
-        Files::TestCaseFile.new(filename: 'test/fixtures/xruby/exercises/alpha/.meta/generator/alpha_case.rb')
+        Files::TestCaseFile.new(filename: 'test/fixtures/ruby/exercises/alpha/.meta/generator/alpha_case.rb')
       end
 
       include TemplateValuesFactory

data/tracks/scala/exercises/rail-fence-cipher/src/test/scala/RailFenceCipherTest.scala

@@ -1,42 +1,35 @@
-import org.scalatest.{FunSuite, Matchers}
+import org.scalatest.{Matchers, FunSuite}
 
+/** @version 1.0.1 */
 class RailFenceCipherTest extends FunSuite with Matchers {
 
-  // Encode test cases
-  test("test to encode with two rails") {
-    val encoded = RailFenceCipher.encode("XOXOXOXOXOXOXOXOXO", 2)
-    encoded should be ("XXXXXXXXXOOOOOOOOO")
+  test("encode with two rails") {
+    RailFenceCipher.encode("XOXOXOXOXOXOXOXOXO", 2) should be ("XXXXXXXXXOOOOOOOOO")
   }
 
-  test("test to encode with three rails") {
+  test("encode with three rails") {
     pending
-    val encoded = RailFenceCipher.encode("WEAREDISCOVEREDFLEEATONCE", 3)
-    encoded should be ("WECRLTEERDSOEEFEAOCAIVDEN")
+    RailFenceCipher.encode("WEAREDISCOVEREDFLEEATONCE", 3) should be ("WECRLTEERDSOEEFEAOCAIVDEN")
   }
 
-  test("test to encode with ending in the middle") {
+  test("encode with ending in the middle") {
     pending
-    val encoded = RailFenceCipher.encode("EXERCISES", 4)
-    encoded should be ("ESXIEECSR")
+    RailFenceCipher.encode("EXERCISES", 4) should be ("ESXIEECSR")
   }
 
-  // Decode test cases
-  test("test to decode with three rails") {
+  test("decode with three rails") {
     pending
-    val decoded = RailFenceCipher.decode("TEITELHDVLSNHDTISEIIEA", 3)
-    decoded should be ("THEDEVILISINTHEDETAILS")
+    RailFenceCipher.decode("TEITELHDVLSNHDTISEIIEA", 3) should be ("THEDEVILISINTHEDETAILS")
   }
 
-  test("test to decode with five rails") {
+  test("decode with five rails") {
     pending
-    val decoded = RailFenceCipher.decode("EIEXMSMESAORIWSCE", 5)
-    decoded should be ("EXERCISMISAWESOME")
+    RailFenceCipher.decode("EIEXMSMESAORIWSCE", 5) should be ("EXERCISMISAWESOME")
   }
 
-  test("test to decode with six rails") {
+  test("decode with six rails") {
     pending
-    val decoded = RailFenceCipher.decode("133714114238148966225439541018335470986172518171757571896261", 6)
-    decoded should be ("112358132134558914423337761098715972584418167651094617711286")
+    RailFenceCipher.decode("133714114238148966225439541018335470986172518171757571896261", 6) should
+      be ("112358132134558914423337761098715972584418167651094617711286")
   }
-
-}
+}

data/tracks/scala/exercises/say/src/test/scala/SayTest.scala

@@ -1,93 +1,80 @@
 import org.scalatest.{Matchers, FunSuite}
 
+/** @version 1.0.0 */
 class SayTest extends FunSuite with Matchers {
+  
   test("zero") {
     Say.inEnglish(0) should be (Some("zero"))
   }
 
-  test("one") { 
+  test("one") {
     pending
     Say.inEnglish(1) should be (Some("one"))
   }
 
-  test("fourteen") { 
+  test("fourteen") {
     pending
     Say.inEnglish(14) should be (Some("fourteen"))
   }
 
-  test("twenty") { 
+  test("twenty") {
     pending
     Say.inEnglish(20) should be (Some("twenty"))
   }
 
-  test("twenty-two") { 
+  test("twenty-two") {
     pending
     Say.inEnglish(22) should be (Some("twenty-two"))
   }
 
-  test("fifty") { 
-    pending
-    Say.inEnglish(50) should be (Some("fifty"))
-  }
-
-  test("ninety-eight") { 
-    pending
-    Say.inEnglish(98) should be (Some("ninety-eight"))
-  }
-
-  test("one hundred") { 
+  test("one hundred") {
     pending
     Say.inEnglish(100) should be (Some("one hundred"))
   }
 
-  test("one hundred twenty-three") { 
+  test("one hundred twenty-three") {
     pending
     Say.inEnglish(123) should be (Some("one hundred twenty-three"))
   }
 
-  test("one thousand") { 
+  test("one thousand") {
     pending
     Say.inEnglish(1000) should be (Some("one thousand"))
   }
 
-  test("one thousand two hundred thirty-four") { 
+  test("one thousand two hundred thirty-four") {
     pending
     Say.inEnglish(1234) should be (Some("one thousand two hundred thirty-four"))
   }
 
-  test("one million") { 
+  test("one million") {
     pending
     Say.inEnglish(1000000) should be (Some("one million"))
   }
 
-  test("one million two") { 
-    pending
-    Say.inEnglish(1000002) should be (Some("one million two"))
-  }
-
-  test("one million two thousand three hundred forty-five") { 
+  test("one million two thousand three hundred forty-five") {
     pending
     Say.inEnglish(1002345) should be (Some("one million two thousand three hundred forty-five"))
   }
 
-  test("one billion") { 
+  test("one billion") {
     pending
     Say.inEnglish(1000000000) should be (Some("one billion"))
   }
 
-  test("A big number") { 
+  test("a big number") {
     pending
-    Say.inEnglish(987654321123L) should be (Some("nine hundred eighty-seven billion " +
-      "six hundred fifty-four million three hundred twenty-one thousand one hundred twenty-three"))
+    Say.inEnglish(987654321123l) should
+      be (Some("nine hundred eighty-seven billion six hundred fifty-four million three hundred twenty-one thousand one hundred twenty-three"))
   }
 
-  test("Lower bound") { 
+  test("numbers below zero are out of range") {
     pending
     Say.inEnglish(-1) should be (None)
   }
 
-  test("Upper bound") { 
+  test("numbers above 999,999,999,999 are out of range") {
     pending
-    Say.inEnglish(1000000000000L) should be (None)
+    Say.inEnglish(1000000000000l) should be (None)
   }
-}
+}

data/tracks/scala/testgen/src/main/scala/RailFenceCipherTestGenerator.scala

@@ -1,59 +1,15 @@
-import play.api.libs.json.Json
+import java.io.File
 
-import scala.io.Source
-
-// Generates test suite from json test definition for the RailFenceCipher exercise.
-class RailFenceCipherTestGenerator {
-  implicit val railFenceTestCaseReader = Json.reads[RailFenceTestCase]
-
-  private val filename = "rail-fence.json"
-  private val fileContents = Source.fromFile(filename).getLines.mkString
-  private val json = Json.parse(fileContents)
-
-  def write {
-    val testBuilder = new TestBuilder("RailFenceCipherTest")
-    addEncodeTests(testBuilder)
-    addDecodeTests(testBuilder)
-    testBuilder.toFile
-  }
-
-  private def addEncodeTests(testBuilder: TestBuilder): Unit = {
-    val description = "Encode test cases"
-    val encodeTestCases = (json \ "encode" \ "cases").get.as[List[RailFenceTestCase]]
-
-    implicit def testCaseToGen(tc: RailFenceTestCase): TestCaseGen = {
-      val callSUT = s"""RailFenceCipher.encode("${tc.msg}", ${tc.rails})"""
-      val expected = tc.expected
-      val result = s"val encoded = $callSUT"
-      val checkResult = s"""encoded should be ("$expected")"""
-
-      TestCaseGen(tc.description, callSUT, expected, result, checkResult)
-    }
-
-    testBuilder.addTestCases(encodeTestCases, Some(description))
-  }
-
-  private def addDecodeTests(testBuilder: TestBuilder): Unit = {
-    val description = "Decode test cases"
-    val encodeTestCases = (json \ "decode" \ "cases").get.as[List[RailFenceTestCase]]
-
-    implicit def testCaseToGen(tc: RailFenceTestCase): TestCaseGen = {
-      val callSUT = s"""RailFenceCipher.decode("${tc.msg}", ${tc.rails})"""
-      val expected = tc.expected
-      val result = s"val decoded = $callSUT"
-      val checkResult = s"""decoded should be ("$expected")"""
-
-      TestCaseGen(tc.description, callSUT, expected, result, checkResult)
-    }
-
-    testBuilder.addTestCases(encodeTestCases, Some(description))
-  }
-}
-
-case class RailFenceTestCase(description: String, msg: String, rails: Int, expected: String)
+import testgen.TestSuiteBuilder._
+import testgen._
 
 object RailFenceCipherTestGenerator {
   def main(args: Array[String]): Unit = {
-    new RailFenceCipherTestGenerator().write
+    val file = new File("src/main/resources/rail-fence-cipher.json")
+
+    val code = TestSuiteBuilder.build(file, fromLabeledTest("msg", "rails"))
+    println(s"-------------")
+    println(code)
+    println(s"-------------")
   }
 }