From 53cfc921440668ddabd7d8192fada69348486a7f Mon Sep 17 00:00:00 2001
From: Vivien Maisonneuve <v.maisonneuve@gmail.com>
Date: Thu, 3 Jul 2014 15:42:35 +0200
Subject: [PATCH] Improve tests involving iterators
---
pypol/tests/test_linexprs.py | 16 ++++++++--------
pypol/tests/test_polyhedra.py | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py
index 4c27b21..68cad74 100644
--- a/pypol/tests/test_linexprs.py
+++ b/pypol/tests/test_linexprs.py
@@ -59,7 +59,7 @@ class TestExpression(unittest.TestCase):
self.expr[self.expr]
def test_coefficients(self):
- self.assertCountEqual(self.expr.coefficients(), [(self.x, 1), (self.y, -2)])
+ self.assertListEqual(list(self.expr.coefficients()), [(self.x, 1), (self.y, -2)])
def test_constant(self):
self.assertEqual(self.x.constant, 0)
@@ -67,9 +67,9 @@ class TestExpression(unittest.TestCase):
self.assertEqual(self.expr.constant, 3)
def test_symbols(self):
- self.assertCountEqual(self.x.symbols, [self.x])
- self.assertCountEqual(self.pi.symbols, [])
- self.assertCountEqual(self.expr.symbols, [self.x, self.y])
+ self.assertTupleEqual(self.x.symbols, (self.x,))
+ self.assertTupleEqual(self.pi.symbols, ())
+ self.assertTupleEqual(self.expr.symbols, (self.x, self.y))
def test_dimension(self):
self.assertEqual(self.x.dimension, 1)
@@ -87,7 +87,7 @@ class TestExpression(unittest.TestCase):
self.assertFalse(self.expr.issymbol())
def test_values(self):
- self.assertCountEqual(self.expr.values(), [1, -2, 3])
+ self.assertListEqual(list(self.expr.values()), [1, -2, 3])
def test_bool(self):
self.assertTrue(self.x)
@@ -250,9 +250,9 @@ class TestSymbols(unittest.TestCase):
self.y = Symbol('y')
def test(self):
- self.assertListEqual(list(symbols('x y')), [self.x, self.y])
- self.assertListEqual(list(symbols('x,y')), [self.x, self.y])
- self.assertListEqual(list(symbols(['x', 'y'])), [self.x, self.y])
+ self.assertTupleEqual(symbols('x y'), (self.x, self.y))
+ self.assertTupleEqual(symbols('x,y'), (self.x, self.y))
+ self.assertTupleEqual(symbols(['x', 'y']), (self.x, self.y))
with self.assertRaises(TypeError):
symbols(1)
with self.assertRaises(TypeError):
diff --git a/pypol/tests/test_polyhedra.py b/pypol/tests/test_polyhedra.py
index 7b8e033..689602b 100644
--- a/pypol/tests/test_polyhedra.py
+++ b/pypol/tests/test_polyhedra.py
@@ -13,7 +13,7 @@ class TestPolyhedron(unittest.TestCase):
self.square = Polyhedron(inequalities=[x, 1 - x, y, 1 - y])
def test_symbols(self):
- self.assertCountEqual(self.square.symbols, symbols('x y'))
+ self.assertTupleEqual(self.square.symbols, symbols('x y'))
def test_dimension(self):
self.assertEqual(self.square.dimension, 2)
--
2.20.1