viff

changeset 590:8a79bf7ed805

Corrected number of blank lines between class definitions.
author Martin Geisler <mg@daimi.au.dk>
date Thu, 20 Mar 2008 00:09:46 +0100
parents b1397f54a28c
children 80e49a760164
files viff/test/test_basic_runtime.py viff/test/test_runtime.py viff/test/test_runtime_comp.py
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/viff/test/test_basic_runtime.py	Thu Mar 20 00:08:33 2008 +0100
     1.2 +++ b/viff/test/test_basic_runtime.py	Thu Mar 20 00:09:46 2008 +0100
     1.3 @@ -20,8 +20,8 @@
     1.4  from twisted.internet.defer import Deferred, gatherResults
     1.5  
     1.6  from viff.test.util import RuntimeTestCase, protocol
     1.7 +from viff.runtime import increment_pc
     1.8  
     1.9 -from viff.runtime import increment_pc
    1.10  
    1.11  class ProgramCounterTest(RuntimeTestCase):
    1.12      """Program counter tests."""
    1.13 @@ -55,7 +55,6 @@
    1.14          runtime.xor(self.Zp(0), self.Zp(1))
    1.15          self.assertEquals(runtime.program_counter, [2])
    1.16  
    1.17 -
    1.18      @protocol
    1.19      def test_callback(self, runtime):
    1.20          """Test a scheduled callback.
    1.21 @@ -76,7 +75,6 @@
    1.22          # Now trigger verify_program_counter.
    1.23          d.callback(None)
    1.24  
    1.25 -
    1.26      @protocol
    1.27      def test_nested_calls(self, runtime):
    1.28          """Test Runtime methods that call other methods.
     2.1 --- a/viff/test/test_runtime.py	Thu Mar 20 00:08:33 2008 +0100
     2.2 +++ b/viff/test/test_runtime.py	Thu Mar 20 00:09:46 2008 +0100
     2.3 @@ -34,18 +34,21 @@
     2.4  from viff.field import GF256
     2.5  from viff.runtime import Share
     2.6  from viff.comparison import Toft05Runtime
     2.7 +from viff.test.util import RuntimeTestCase, BinaryOperatorTestCase, protocol
     2.8  
     2.9 -from viff.test.util import RuntimeTestCase, BinaryOperatorTestCase, protocol
    2.10  
    2.11  class AddTest(BinaryOperatorTestCase, RuntimeTestCase):
    2.12      operator = operator.add
    2.13  
    2.14 +
    2.15  class SubTest(BinaryOperatorTestCase, RuntimeTestCase):
    2.16      operator = operator.sub
    2.17  
    2.18 +
    2.19  class MulTest(BinaryOperatorTestCase, RuntimeTestCase):
    2.20      operator = operator.mul
    2.21  
    2.22 +
    2.23  class XorTest(BinaryOperatorTestCase, RuntimeTestCase):
    2.24      a = 0
    2.25      b = 1
     3.1 --- a/viff/test/test_runtime_comp.py	Thu Mar 20 00:08:33 2008 +0100
     3.2 +++ b/viff/test/test_runtime_comp.py	Thu Mar 20 00:09:46 2008 +0100
     3.3 @@ -24,18 +24,22 @@
     3.4  from viff.comparison import Toft05Runtime, Toft07Runtime
     3.5  from viff.test.util import RuntimeTestCase, BinaryOperatorTestCase
     3.6  
     3.7 +
     3.8  class Toft05GreaterThanTest(BinaryOperatorTestCase, RuntimeTestCase):
     3.9      runtime_class = Toft05Runtime
    3.10      operator = operator.gt
    3.11  
    3.12 +
    3.13  class Toft05GreaterThanEqualTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.14      runtime_class = Toft05Runtime
    3.15      operator = operator.ge
    3.16  
    3.17 +
    3.18  class Toft05LessThanTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.19      runtime_class = Toft05Runtime
    3.20      operator = operator.lt
    3.21  
    3.22 +
    3.23  class Toft05LessThanEqualTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.24      runtime_class = Toft05Runtime
    3.25      operator = operator.le
    3.26 @@ -45,14 +49,17 @@
    3.27      runtime_class = Toft07Runtime
    3.28      operator = operator.gt
    3.29  
    3.30 +
    3.31  class Toft07GreaterThanEqualTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.32      runtime_class = Toft07Runtime
    3.33      operator = operator.ge
    3.34  
    3.35 +
    3.36  class Toft07LessThanTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.37      runtime_class = Toft07Runtime
    3.38      operator = operator.lt
    3.39  
    3.40 +
    3.41  class Toft07LessThanEqualTest(BinaryOperatorTestCase, RuntimeTestCase):
    3.42      runtime_class = Toft07Runtime
    3.43      operator = operator.le