trackler 2.0.6.40 → 2.0.6.41

data/tracks/php/exercises/minesweeper/minesweeper_test.php

@@ -2,7 +2,7 @@
 
 require 'minesweeper.php';
 
-class MinesweeperTest extends PHPUnit_Framework_TestCase
+class MinesweeperTest extends PHPUnit\Framework\TestCase
 {
     public function testAnEmptyBoard()
     {
@@ -22,7 +22,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
    |
 +--+
 ';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($incompleteBoard);
     }
@@ -35,7 +35,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
 |  |
 +--+
 ';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($incompleteBoard);
     }
@@ -48,7 +48,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
 |  |
 +--+
 ';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($incompleteBoard);
     }
@@ -61,7 +61,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
 | |
 +-+
 ';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($tinyBoard);
     }
@@ -76,7 +76,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
 +---+
 ';
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($unequalBoard);
     }
@@ -92,7 +92,7 @@ class MinesweeperTest extends PHPUnit_Framework_TestCase
 +---+
 ';
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         solve($badBoard);
     }

data/tracks/php/exercises/nucleotide-count/nucleotide-count_test.php

@@ -2,7 +2,7 @@
 
 require "nucleotide-count.php";
 
-class NucleotideCountTest extends \PHPUnit_Framework_TestCase
+class NucleotideCountTest extends PHPUnit\Framework\TestCase
 {
     public function testEmptyDNASequence()
     {

data/tracks/php/exercises/ocr-numbers/ocr-numbers_test.php

@@ -2,7 +2,7 @@
 
 include_once 'ocr-numbers.php';
 
-class OcrNumbersTest extends PHPUnit_Framework_TestCase
+class OcrNumbersTest extends PHPUnit\Framework\TestCase
 {
 
     /**

data/tracks/php/exercises/pangram/pangram_test.php

@@ -2,7 +2,7 @@
 
 require "pangram.php";
 
-class PangramTest extends PHPUnit_Framework_TestCase
+class PangramTest extends PHPUnit\Framework\TestCase
 {
     public function testSentenceEmpty()
     {

data/tracks/php/exercises/phone-number/phone-number_test.php

@@ -2,7 +2,7 @@
 
 require "phone-number.php";
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends PHPUnit\Framework\TestCase
 {
     public function testCleansNumber()
     {

data/tracks/php/exercises/pig-latin/pig-latin_test.php

@@ -1,7 +1,7 @@
 <?php
 require_once "pig-latin.php";
 
-class PigLatinTest extends PHPUnit_Framework_TestCase
+class PigLatinTest extends PHPUnit\Framework\TestCase
 {
     public function testWordBeginningWithP()
     {

data/tracks/php/exercises/raindrops/raindrops_test.php

@@ -2,7 +2,7 @@
 
 require "raindrops.php";
 
-class RaindropsTest extends PHPUnit_Framework_TestCase
+class RaindropsTest extends PHPUnit\Framework\TestCase
 {
     public function test1()
     {

data/tracks/php/exercises/rna-transcription/rna-transcription_test.php

@@ -2,7 +2,7 @@
 
 require "rna-transcription.php";
 
-class ComplementTest extends \PHPUnit_Framework_TestCase
+class ComplementTest extends PHPUnit\Framework\TestCase
 {
     public function testTranscribesGuanineToCytosine()
     {

data/tracks/php/exercises/robot-name/robot-name_test.php

@@ -2,7 +2,7 @@
 
 require_once "robot-name.php";
 
-class RobotTest extends PHPUnit_Framework_TestCase
+class RobotTest extends PHPUnit\Framework\TestCase
 {
     /** @var Robot $robot */
     protected $robot = null;

data/tracks/php/exercises/robot-simulator/robot-simulator_test.php

@@ -2,7 +2,7 @@
 
 include_once 'robot-simulator.php';
 
-class RobotSimulatorTest extends PHPUnit_Framework_TestCase
+class RobotSimulatorTest extends PHPUnit\Framework\TestCase
 {
 
 

data/tracks/php/exercises/roman-numerals/roman-numerals_test.php

@@ -2,7 +2,7 @@
 
 require_once "roman-numerals.php";
 
-class RomanTest extends PHPUnit_Framework_TestCase
+class RomanTest extends PHPUnit\Framework\TestCase
 {
     public function test1()
     {

data/tracks/php/exercises/sieve/sieve_test.php

@@ -1,6 +1,6 @@
 <?php
 require "sieve.php";
-class SieveTest extends PHPUnit_Framework_TestCase
+class SieveTest extends PHPUnit\Framework\TestCase
 {
     public function testNoPrimesUnderTwo()
     {

data/tracks/php/exercises/space-age/space-age_test.php

@@ -2,7 +2,7 @@
 
 require "space-age.php";
 
-class SpaceAgeTester extends PHPUnit_Framework_TestCase
+class SpaceAgeTester extends PHPUnit\Framework\TestCase
 {
     const DELTA = 0.01;
 

data/tracks/php/exercises/triangle/triangle_test.php

@@ -2,7 +2,7 @@
 
 require "triangle.php";
 
-class TriangleTest extends \PHPUnit_Framework_TestCase
+class TriangleTest extends PHPUnit\Framework\TestCase
 {
     public function testEquilateralTrianglesHaveEqualSides()
     {

data/tracks/php/exercises/trinary/trinary_test.php

@@ -2,7 +2,7 @@
 
 require "trinary.php";
 
-class TrinaryTest extends \PHPUnit_Framework_TestCase
+class TrinaryTest extends PHPUnit\Framework\TestCase
 {
     public function test1IsDecimal1()
     {

data/tracks/php/exercises/variable-length-quantity/variable-length-quantity_test.php

@@ -2,7 +2,7 @@
 
 require_once 'variable-length-quantity.php';
 
-class VariableLengthQuantityTest extends PHPUnit_Framework_TestCase
+class VariableLengthQuantityTest extends PHPUnit\Framework\TestCase
 {
     public function testItEncodesSingleBytes()
     {
@@ -111,7 +111,7 @@ class VariableLengthQuantityTest extends PHPUnit_Framework_TestCase
     {
         $this->markTestSkipped();
 
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         vlq_decode([0xff]);
     }
@@ -120,7 +120,7 @@ class VariableLengthQuantityTest extends PHPUnit_Framework_TestCase
     {
         $this->markTestSkipped();
 
-        $this->setExpectedException(OverflowException::class);
+        $this->expectException(OverflowException::class);
 
         vlq_decode([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f]);
     }

data/tracks/php/exercises/word-count/word-count_test.php

@@ -2,7 +2,7 @@
 
 require "word-count.php";
 
-class WordCountTest extends PHPUnit_Framework_TestCase
+class WordCountTest extends PHPUnit\Framework\TestCase
 {
     public function testCountOneWord()
     {

data/tracks/php/exercises/wordy/wordy_test.php

@@ -2,7 +2,7 @@
 
 require "wordy.php";
 
-class WordProblemTest extends \PHPUnit_Framework_TestCase
+class WordProblemTest extends PHPUnit\Framework\TestCase
 {
     public function testAdd1()
     {
@@ -90,7 +90,7 @@ class WordProblemTest extends \PHPUnit_Framework_TestCase
     public function testTooAdvanced()
     {
         $this->markTestSkipped();
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         calculate('What is 53 cubed?');
     }
@@ -98,7 +98,7 @@ class WordProblemTest extends \PHPUnit_Framework_TestCase
     public function testIrrelevant()
     {
         $this->markTestSkipped();
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         calculate('Who is the president of the United States?');
     }

data/tracks/python/config.json

@@ -322,12 +322,6 @@
       "topics": [
       ]
     },
-    {
-      "slug": "binary",
-      "difficulty": 1,
-      "topics": [
-      ]
-    },
     {
       "slug": "palindrome-products",
       "difficulty": 1,
@@ -340,12 +334,6 @@
       "topics": [
       ]
     },
-    {
-      "slug": "hexadecimal",
-      "difficulty": 1,
-      "topics": [
-      ]
-    },
     {
       "slug": "minesweeper",
       "difficulty": 1,
@@ -440,7 +428,9 @@
     "proverb",
     "raindrops",
     "strain",
-    "trinary"
+    "trinary",
+    "binary",
+    "hexadecimal"
   ],
   "ignored": [
     "docs",

data/tracks/python/exercises/rectangles/rectangles_count_test.py

@@ -4,69 +4,62 @@ from rectangles import count
 
 
 class WordTest(unittest.TestCase):
-    # unit tests
     def test_zero_area_1(self):
-        assert 0 == count()
+        self.assertEqual(0, count())
 
     def test_zero_area_2(self):
         lines = ""
-        assert 0 == count(lines)
+        self.assertEqual(0, count(lines))
 
     def test_empty_area(self):
         lines = " "
-        assert 0 == count(lines)
+        self.assertEqual(0, count(lines))
 
     def test_one_rectangle(self):
         lines = ["+-+",
                  "| |",
-                 "+-+",
-                 ]
-        assert 1 == count(lines)
+                 "+-+"]
+        self.assertEqual(1, count(lines))
 
     def test_two_rectangles_no_shared_parts(self):
         lines = ["  +-+",
                  "  | |",
                  "+-+-+",
                  "| |  ",
-                 "+-+  "
-                 ]
-        assert 2 == count(lines)
+                 "+-+  "]
+        self.assertEqual(2, count(lines))
 
     def test_five_rectangles_three_regions(self):
         lines = ["  +-+",
                  "  | |",
                  "+-+-+",
                  "| | |",
-                 "+-+-+"
-                 ]
-        assert 5 == count(lines)
+                 "+-+-+"]
+        self.assertEqual(5, count(lines))
 
     def test_incomplete_rectangles(self):
         lines = ["  +-+",
                  "    |",
                  "+-+-+",
                  "| | -",
-                 "+-+-+"
-                 ]
-        assert 1 == count(lines)
+                 "+-+-+"]
+        self.assertEqual(1, count(lines))
 
     def test_complicated(self):
         lines = ["+------+----+",
                  "|      |    |",
                  "+---+--+    |",
                  "|   |       |",
-                 "+---+-------+"
-                 ]
-        assert 3 == count(lines)
+                 "+---+-------+"]
+        self.assertEqual(3, count(lines))
 
     def test_not_so_complicated(self):
         lines = ["+------+----+",
                  "|      |    |",
                  "+------+    |",
                  "|   |       |",
-                 "+---+-------+"
-                 ]
-        assert 2 == count(lines)
+                 "+---+-------+"]
+        self.assertEqual(2, count(lines))
 
 
 if __name__ == '__main__':