Update dedup tests

Rename test fuctions so they are realted to dedup
Simplify code since we know parse expressions

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/test_license_expression.py

@@ -640,75 +640,66 @@ def test_simplify_and_contains(self):
         expr3 = l.parse('mit and LGPL2.1')
         assert expr3 in expr2
 
-    def test_expressions_can_be_simplified_1(self):
+    def test_dedup_expressions_can_be_simplified_1(self):
         l = Licensing()
-        exp = l.parse('mit OR mit AND apache-2.0 AND bsd-new OR mit')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        exp = 'mit OR mit AND apache-2.0 AND bsd-new OR mit'
+        result = l.dedup(exp)
         expected = l.parse('mit OR (mit AND apache-2.0 AND bsd-new)')
         assert result == expected
 
-    def test_expressions_can_be_simplified_2(self):
+    def test_dedup_expressions_can_be_simplified_2(self):
         l = Licensing()
-        exp = l.parse('mit AND (mit OR bsd-new) AND mit OR mit')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        exp = 'mit AND (mit OR bsd-new) AND mit OR mit'
+        result = l.dedup(exp)
         expected = l.parse('(mit AND (mit OR bsd-new)) OR mit')
         assert result == expected
 
-    def test_expressions_multiple_occurrences(self):
+    def test_dedup_expressions_multiple_occurrences(self):
         l = Licensing()
-        exp = l.parse(' GPL-2.0 or (mit and LGPL-2.1) or bsd Or GPL-2.0  or (mit and LGPL-2.1)')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        exp = ' GPL-2.0 or (mit and LGPL-2.1) or bsd Or GPL-2.0  or (mit and LGPL-2.1)'
+        result = l.dedup(exp)
         expected = l.parse('GPL-2.0 OR (mit AND LGPL-2.1) OR bsd')
         assert result == expected
 
-    def test_expressions_cannot_be_simplified(self):
+    def test_dedup_expressions_cannot_be_simplified(self):
         l = Licensing()
         exp = l.parse('mit AND (mit OR bsd-new)')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('mit AND (mit OR bsd-new)')
         assert result == expected
 
-    def test_expressions_single_license(self):
+    def test_dedup_expressions_single_license(self):
         l = Licensing()
         exp = l.parse('mit')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('mit')
         assert result == expected
 
-    def test_expressions_WITH(self):
+    def test_dedup_expressions_WITH(self):
         l = Licensing()
         exp = l.parse('gpl-2.0 with autoconf-exception-2.0')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('gpl-2.0 with autoconf-exception-2.0')
         assert result == expected
 
-    def test_expressions_WITH_OR(self):
+    def test_dedup_expressions_WITH_OR(self):
         l = Licensing()
         exp = l.parse('gpl-2.0 with autoconf-exception-2.0 OR gpl-2.0')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('gpl-2.0 with autoconf-exception-2.0 OR gpl-2.0')
         assert result == expected
 
-    def test_expressions_WITH_AND(self):
+    def test_dedup_expressions_WITH_AND(self):
         l = Licensing()
         exp = l.parse('gpl-2.0 AND gpl-2.0 with autoconf-exception-2.0 AND gpl-2.0')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('gpl-2.0 AND gpl-2.0 with autoconf-exception-2.0')
         assert result == expected
 
-    def test_expressions_can_be_simplified_3(self):
+    def test_dedup_licensexpressions_can_be_simplified_3(self):
         l = Licensing()
         exp = l.parse('mit AND mit')
-        dedup_exp = l.dedup(exp)
-        result = l.parse(dedup_exp)
+        result = l.dedup(exp)
         expected = l.parse('mit')
         assert result == expected