Remove "run_common_tests()" in all tests.py to make it work with Pyth…

…on 3

learning/katas/python/Common Transforms/Aggregation/Count/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Common Transforms/Aggregation/Largest/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Common Transforms/Aggregation/Mean/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Common Transforms/Aggregation/Smallest/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_answer_placeholders_text_deleted, test_is_not_empty
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Common Transforms/Aggregation/Sum/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Common Transforms/Filter/Filter/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_filter():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_filter()
  test_output()

learning/katas/python/Common Transforms/Filter/ParDo/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -29,5 +30,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Core Transforms/Branching/Branching/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -39,5 +40,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Core Transforms/CoGroupByKey/CoGroupByKey/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -33,5 +34,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Core Transforms/Combine/Combine PerKey/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_combine_placeholders():
@@ -35,7 +37,7 @@ def test_output():
  PLAYER_3 = 'Player 3'
 
  answers = [str((PLAYER_1, 115)), str((PLAYER_2, 85)), str((PLAYER_3, 25))]
- print answers
+ print(answers)
 
  if all(num in output for num in answers):
  passed()
@@ -44,6 +46,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_combine_placeholders()
  test_output()

learning/katas/python/Core Transforms/Combine/CombineFn/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_combine_placeholders():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_combine_placeholders()
  test_output()

learning/katas/python/Core Transforms/Combine/Simple Function/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_combine_placeholders():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_combine_placeholders()
  test_output()

learning/katas/python/Core Transforms/Composite Transform/Composite Transform/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_composite_expand_method():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_composite_expand_method()
  test_output()

learning/katas/python/Core Transforms/Flatten/Flatten/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_flatten():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_flatten()
  test_output()

learning/katas/python/Core Transforms/GroupByKey/GroupByKey/tests.py

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_file_output
+from test_helper import failed, passed, get_file_output, \
+ test_is_not_empty, test_answer_placeholders_text_deleted
 
 
 def test_output():
@@ -31,5 +32,6 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_output()

learning/katas/python/Core Transforms/Map/FlatMap/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_flatmap():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_flatmap()
  test_output()

learning/katas/python/Core Transforms/Map/Map/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_map():
@@ -39,6 +41,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_map()
  test_output()

learning/katas/python/Core Transforms/Map/ParDo OneToMany/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_dofn_process_method():
@@ -49,7 +51,8 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_dofn_process_method()
  test_pardo()
  test_output()

learning/katas/python/Core Transforms/Map/ParDo/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_dofn_process_method():
@@ -49,7 +51,8 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_dofn_process_method()
  test_pardo()
  test_output()

learning/katas/python/Core Transforms/Partition/Partition/tests.py

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test_helper import run_common_tests, failed, passed, get_answer_placeholders, get_file_output
+from test_helper import failed, passed, \
+ get_answer_placeholders, get_file_output, test_is_not_empty, \
+ test_answer_placeholders_text_deleted
 
 
 def test_partition():
@@ -48,6 +50,7 @@ def test_output():
 
 
 if __name__ == '__main__':
- run_common_tests()
+ test_is_not_empty()
+ test_answer_placeholders_text_deleted()
  test_partition()
  test_output()