CS105x: Adjusted tests in word count lab to account for nondeterminis…

…tic ordering of results.
spark-mooc · Jul 23, 2016 · 369a874 · 369a874
1 parent 7eac58c
commit 369a874
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/cs105_autograder.dbc b/cs105_autograder.dbc
diff --git a/cs105_lab0.dbc b/cs105_lab0.dbc
diff --git a/cs105_lab1a_spark_tutorial.dbc b/cs105_lab1a_spark_tutorial.dbc
diff --git a/cs105_lab1b_word_count.dbc b/cs105_lab1b_word_count.dbc
diff --git a/cs105_lab1b_word_count.py b/cs105_lab1b_word_count.py
@@ -1,4 +1,4 @@
-# Databricks notebook source exported at Tue, 21 Jun 2016 17:08:38 UTC
+# Databricks notebook source exported at Sat, 23 Jul 2016 13:31:09 UTC
 
 # MAGIC %md
 # MAGIC <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"> <img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png"/> </a> <br/> This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"> Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. </a>
@@ -99,7 +99,7 @@
 from collections import Iterable
 asSelf = lambda v: map(lambda r: r[0] if isinstance(r, Iterable) and len(r) == 1 else r, v)
 
-Test.assertEquals(asSelf(pluralLengthsDF.collect()), [4, 9, 4, 4, 4],
+Test.assertEquals(set(asSelf(pluralLengthsDF.collect())), {4, 9, 4, 4, 4},
                   'incorrect values for pluralLengths')
 
 # COMMAND ----------
@@ -133,7 +133,7 @@
 # COMMAND ----------
 
 # TEST groupBy and count (2a)
-Test.assertEquals(wordCountsDF.collect(), [('cat', 2), ('rat', 2), ('elephant', 1)],
+Test.assertEquals(set(wordCountsDF.collect()), {('rat', 2), ('elephant', 1), ('cat', 2)},
                  'incorrect counts for wordCountsDF')
 
 # COMMAND ----------
@@ -224,7 +224,8 @@ def wordCount(wordListDF):
 # COMMAND ----------
 
 # TEST wordCount function (4a)
-Test.assertEquals(sorted(wordCount(wordsDF).collect()),
+res = [(row[0], row[1]) for row in wordCount(wordsDF).collect()]
+Test.assertEquals(sorted(res),
                   [('cat', 2), ('elephant', 1), ('rat', 2)],
                   'incorrect definition for wordCountDF function')
 

diff --git a/cs105_lab2_apache_log.dbc b/cs105_lab2_apache_log.dbc