Fixed FullText and polygon unit test, added FullText and Compare.Program unit test

Author: lin-toto

cyaron/__init__.py

@@ -16,4 +16,3 @@
 from .compare import Compare
 from .math import *
 from random import randint, randrange, uniform, choice, random
-

cyaron/graders/fulltext.py

@@ -5,5 +5,5 @@
 def fulltext(content, std):
     content_hash = hashlib.sha256(content).hexdigest()
     std_hash = hashlib.sha256(std).hexdigest()
-    return True, None if content_hash == std_hash else False, "Hash mismatch: read %s, expected %s" % (content_hash, std_hash)
+    return (True, None) if content_hash == std_hash else (False, "Hash mismatch: read %s, expected %s" % (content_hash, std_hash))
 

cyaron/math.py

@@ -147,15 +147,15 @@ def miller_rabin_pass(a, s, d, n):
 
 
 #--- factor a number into primes and frequency----------------------------------------------------
-"""
-    find the prime factors of n along with their frequencies. Example:
-
-    >>> factor(786456)
-    [(2,3), (3,3), (11,1), (331,1)]
-    
-    Source: Project Euler forums for problem #3
-"""
 def factor(n):
+    """
+        find the prime factors of n along with their frequencies. Example:
+
+        >>> factor(786456)
+        [(2,3), (3,3), (11,1), (331,1)]
+
+        Source: Project Euler forums for problem #3
+    """
     f, factors, prime_gaps = 1, [], [2, 4, 2, 4, 6, 2, 6, 4]
     if n < 1:
         return []
@@ -268,9 +268,9 @@ def exgcd(a,b):
 
     Result is the tuple: (u, v, gcd(a,b)). Examples:
 
-    >>> bezout(7*3, 15*3)
+    >>> exgcd(7*3, 15*3)
     (-2, 1, 3)
-    >>> bezout(24157817, 39088169)    #sequential Fibonacci numbers
+    >>> exgcd(24157817, 39088169)    #sequential Fibonacci numbers
     (-14930352, 9227465, 1)
 
     Algorithm source: Pierre L. Douillet

cyaron/tests/compare_test.py

@@ -42,4 +42,25 @@ def test_noipstyle_incorrect(self):
             Compare.output("test_another_incorrect.out", std=io)
 
         result = out.getvalue().strip()
-        self.assertEqual(result, "test_another_incorrect.out: !!!INCORRECT!!! On line 2 column 7, read 4, expected 3.")
+        self.assertEqual(result, "test_another_incorrect.out: !!!INCORRECT!!! On line 2 column 7, read 4, expected 3.")
+
+    def test_fulltext_program(self):
+        with open("correct.py", "w") as f:
+            f.write("print(1)")
+
+        with open("incorrect.py", "w") as f:
+            f.write("print(2)")
+
+        io = None
+        with captured_output() as (out, err):
+            io = IO("test_fulltext.in", "test_fulltext.out")
+
+        io.output_writeln("1")
+
+        with captured_output() as (out, err):
+            Compare.program("python correct.py", "python incorrect.py", std=io, input=io, grader="FullText")
+
+        result = out.getvalue().strip()
+        correct_text = 'python correct.py: Correct \npython incorrect.py: !!!INCORRECT!!! Hash mismatch: read 53c234e5e8472b6ac51c1ae1cab3fe06fad053beb8ebfd8977b010655bfdd3c3, expected 4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865'
+        self.assertEqual(result, correct_text)
+

cyaron/tests/polygon_test.py

@@ -40,7 +40,7 @@ def test_perimeter_area(self):
         self.assertEqual(poly.perimeter(),4)
         self.assertEqual(poly.area(),1)
     def test_simple_polygon(self):
-        poly = Polygon.simple_polygon(Vector.random(300, [1000, 1000]))
+        poly = Polygon.simple_polygon(Vector.random(300, [1000, 1000], 2))
         points = poly.points
         for i in range(0,len(points)):
             for j in range(i+2,len(points)):