#273: Remove nose dependency for sorting_searching/ (#278)

donnemartin · Jul 11, 2020 · d488e4f · d488e4f
1 parent abf7524
commit d488e4f
Show file tree

Hide file tree

Showing 30 changed files with 257 additions and 333 deletions.
diff --git a/sorting_searching/anagrams/anagrams_challenge.ipynb b/sorting_searching/anagrams/anagrams_challenge.ipynb
@@ -108,17 +108,17 @@
    "outputs": [],
    "source": [
     "# %load test_anagrams.py\n",
-    "from nose.tools import assert_equal, assert_raises\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestAnagrams(object):\n",
+    "class TestAnagrams(unittest.TestCase):\n",
     "\n",
     "    def test_group_anagrams(self):\n",
     "        anagram = Anagram()\n",
-    "        assert_raises(TypeError, anagram.group_anagrams, None)\n",
+    "        self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
     "        data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
     "        expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
-    "        assert_equal(anagram.group_anagrams(data), expected)\n",
+    "        self.assertEqual(anagram.group_anagrams(data), expected)\n",
     "\n",
     "        print('Success: test_group_anagrams')\n",
     "\n",
@@ -158,7 +158,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.4"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,

diff --git a/sorting_searching/anagrams/anagrams_solution.ipynb b/sorting_searching/anagrams/anagrams_solution.ipynb
@@ -98,9 +98,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "from collections import OrderedDict\n",
@@ -138,9 +136,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -152,17 +148,17 @@
    ],
    "source": [
     "%%writefile test_anagrams.py\n",
-    "from nose.tools import assert_equal, assert_raises\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestAnagrams(object):\n",
+    "class TestAnagrams(unittest.TestCase):\n",
     "\n",
     "    def test_group_anagrams(self):\n",
     "        anagram = Anagram()\n",
-    "        assert_raises(TypeError, anagram.group_anagrams, None)\n",
+    "        self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
     "        data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
     "        expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
-    "        assert_equal(anagram.group_anagrams(data), expected)\n",
+    "        self.assertEqual(anagram.group_anagrams(data), expected)\n",
     "\n",
     "        print('Success: test_group_anagrams')\n",
     "\n",
@@ -179,9 +175,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -212,9 +206,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/sorting_searching/anagrams/test_anagrams.py b/sorting_searching/anagrams/test_anagrams.py
@@ -1,14 +1,14 @@
-from nose.tools import assert_equal, assert_raises
+import unittest
 
 
-class TestAnagrams(object):
+class TestAnagrams(unittest.TestCase):
 
     def test_group_anagrams(self):
         anagram = Anagram()
-        assert_raises(TypeError, anagram.group_anagrams, None)
+        self.assertRaises(TypeError, anagram.group_anagrams, None)
         data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']
         expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']
-        assert_equal(anagram.group_anagrams(data), expected)
+        self.assertEqual(anagram.group_anagrams(data), expected)
 
         print('Success: test_group_anagrams')
 
@@ -19,4 +19,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/sorting_searching/insertion_sort/insertion_sort_challenge.ipynb b/sorting_searching/insertion_sort/insertion_sort_challenge.ipynb
@@ -75,9 +75,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class InsertionSort(object):\n",
@@ -101,32 +99,30 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# %load test_insertion_sort.py\n",
-    "from nose.tools import assert_equal, assert_raises\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestInsertionSort(object):\n",
+    "class TestInsertionSort(unittest.TestCase):\n",
     "\n",
     "    def test_insertion_sort(self):\n",
     "        insertion_sort = InsertionSort()\n",
     "\n",
     "        print('None input')\n",
-    "        assert_raises(TypeError, insertion_sort.sort, None)\n",
+    "        self.assertRaises(TypeError, insertion_sort.sort, None)\n",
     "\n",
     "        print('Empty input')\n",
-    "        assert_equal(insertion_sort.sort([]), [])\n",
+    "        self.assertEqual(insertion_sort.sort([]), [])\n",
     "\n",
     "        print('One element')\n",
-    "        assert_equal(insertion_sort.sort([5]), [5])\n",
+    "        self.assertEqual(insertion_sort.sort([5]), [5])\n",
     "\n",
     "        print('Two or more elements')\n",
     "        data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
-    "        assert_equal(insertion_sort.sort(data), sorted(data))\n",
+    "        self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
     "\n",
     "        print('Success: test_insertion_sort')\n",
     "\n",
@@ -166,9 +162,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/sorting_searching/insertion_sort/insertion_sort_solution.ipynb b/sorting_searching/insertion_sort/insertion_sort_solution.ipynb
@@ -93,9 +93,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "class InsertionSort(object):\n",
@@ -125,9 +123,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -139,26 +135,26 @@
    ],
    "source": [
     "%%writefile test_insertion_sort.py\n",
-    "from nose.tools import assert_equal, assert_raises\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestInsertionSort(object):\n",
+    "class TestInsertionSort(unittest.TestCase):\n",
     "\n",
     "    def test_insertion_sort(self):\n",
     "        insertion_sort = InsertionSort()\n",
     "\n",
     "        print('None input')\n",
-    "        assert_raises(TypeError, insertion_sort.sort, None)\n",
+    "        self.assertRaises(TypeError, insertion_sort.sort, None)\n",
     "\n",
     "        print('Empty input')\n",
-    "        assert_equal(insertion_sort.sort([]), [])\n",
+    "        self.assertEqual(insertion_sort.sort([]), [])\n",
     "\n",
     "        print('One element')\n",
-    "        assert_equal(insertion_sort.sort([5]), [5])\n",
+    "        self.assertEqual(insertion_sort.sort([5]), [5])\n",
     "\n",
     "        print('Two or more elements')\n",
     "        data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
-    "        assert_equal(insertion_sort.sort(data), sorted(data))\n",
+    "        self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
     "\n",
     "        print('Success: test_insertion_sort')\n",
     "\n",
@@ -175,9 +171,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -212,9 +206,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.0"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/sorting_searching/insertion_sort/test_insertion_sort.py b/sorting_searching/insertion_sort/test_insertion_sort.py
@@ -1,23 +1,23 @@
-from nose.tools import assert_equal, assert_raises
+import unittest
 
 
-class TestInsertionSort(object):
+class TestInsertionSort(unittest.TestCase):
 
     def test_insertion_sort(self):
         insertion_sort = InsertionSort()
 
         print('None input')
-        assert_raises(TypeError, insertion_sort.sort, None)
+        self.assertRaises(TypeError, insertion_sort.sort, None)
 
         print('Empty input')
-        assert_equal(insertion_sort.sort([]), [])
+        self.assertEqual(insertion_sort.sort([]), [])
 
         print('One element')
-        assert_equal(insertion_sort.sort([5]), [5])
+        self.assertEqual(insertion_sort.sort([5]), [5])
 
         print('Two or more elements')
         data = [5, 1, 7, 2, 6, -3, 5, 7, -1]
-        assert_equal(insertion_sort.sort(data), sorted(data))
+        self.assertEqual(insertion_sort.sort(data), sorted(data))
 
         print('Success: test_insertion_sort')
 
@@ -28,4 +28,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/sorting_searching/merge_into/merge_into_challenge.ipynb b/sorting_searching/merge_into/merge_into_challenge.ipynb
@@ -111,23 +111,23 @@
    "outputs": [],
    "source": [
     "# %load test_merge_into.py\n",
-    "from nose.tools import assert_equal, assert_raises\n",
+    "import unittest\n",
     "\n",
     "\n",
-    "class TestArray(object):\n",
+    "class TestArray(unittest.TestCase):\n",
     "\n",
     "    def test_merge_into(self):\n",
     "        array = Array()\n",
-    "        assert_raises(TypeError, array.merge_into, None, None, None, None)\n",
-    "        assert_raises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
+    "        self.assertRaises(TypeError, array.merge_into, None, None, None, None)\n",
+    "        self.assertRaises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
     "        a = [1, 2, 3]\n",
-    "        assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
+    "        self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
     "        a = [1, 2, 3]\n",
-    "        assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
+    "        self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
     "        a = [1,  3,  5,  7,  9,  None,  None,  None]\n",
     "        b = [4,  5,  6]\n",
     "        expected = [1, 3, 4, 5, 5, 6, 7, 9]\n",
-    "        assert_equal(array.merge_into(a, b, 5, len(b)), expected)\n",
+    "        self.assertEqual(array.merge_into(a, b, 5, len(b)), expected)\n",
     "        print('Success: test_merge_into')\n",
     "\n",
     "\n",
@@ -166,7 +166,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.4"
+   "version": "3.7.2"
   }
  },
  "nbformat": 4,