Update tests to not call deprecated API

Author: jsiirola

pyomo/solvers/tests/checks/test_amplfunc_merge.py

@@ -10,14 +10,14 @@
 #  ___________________________________________________________________________
 
 import pyomo.common.unittest as unittest
-from pyomo.solvers.amplfunc_merge import amplfunc_string_merge, amplfunc_merge
+from pyomo.solvers.amplfunc_merge import unique_paths, amplfunc_merge
 
 
 class TestAMPLFUNCStringMerge(unittest.TestCase):
     def test_merge_no_dup(self):
         s1 = "my/place/l1.so\nanother/place/l1.so"
         s2 = "my/place/l2.so"
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 3)
         # The order of lines should be maintained with the second string
@@ -29,40 +29,40 @@ def test_merge_no_dup(self):
     def test_merge_empty1(self):
         s1 = ""
         s2 = "my/place/l2.so"
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 1)
         self.assertEqual(sm_list[0], "my/place/l2.so")
 
     def test_merge_empty2(self):
         s1 = "my/place/l2.so"
         s2 = ""
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 1)
         self.assertEqual(sm_list[0], "my/place/l2.so")
 
     def test_merge_empty_both(self):
         s1 = ""
         s2 = ""
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 1)
         self.assertEqual(sm_list[0], "")
 
     def test_merge_bad_type(self):
-        self.assertRaises(AttributeError, amplfunc_string_merge, "", 3)
-        self.assertRaises(AttributeError, amplfunc_string_merge, 3, "")
-        self.assertRaises(AttributeError, amplfunc_string_merge, 3, 3)
-        self.assertRaises(AttributeError, amplfunc_string_merge, None, "")
-        self.assertRaises(AttributeError, amplfunc_string_merge, "", None)
-        self.assertRaises(AttributeError, amplfunc_string_merge, 2.3, "")
-        self.assertRaises(AttributeError, amplfunc_string_merge, "", 2.3)
+        self.assertRaises(AttributeError, unique_paths, "", 3)
+        self.assertRaises(AttributeError, unique_paths, 3, "")
+        self.assertRaises(AttributeError, unique_paths, 3, 3)
+        self.assertRaises(AttributeError, unique_paths, None, "")
+        self.assertRaises(AttributeError, unique_paths, "", None)
+        self.assertRaises(AttributeError, unique_paths, 2.3, "")
+        self.assertRaises(AttributeError, unique_paths, "", 2.3)
 
     def test_merge_duplicate1(self):
         s1 = "my/place/l1.so\nanother/place/l1.so"
         s2 = "my/place/l1.so\nanother/place/l1.so"
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 2)
         # The order of lines should be maintained with the second string
@@ -73,7 +73,7 @@ def test_merge_duplicate1(self):
     def test_merge_duplicate2(self):
         s1 = "my/place/l1.so\nanother/place/l1.so"
         s2 = "my/place/l1.so"
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 2)
         # The order of lines should be maintained with the second string
@@ -84,7 +84,7 @@ def test_merge_duplicate2(self):
     def test_merge_extra_linebreaks(self):
         s1 = "\nmy/place/l1.so\nanother/place/l1.so\n"
         s2 = "\nmy/place/l1.so\n\n"
-        sm = amplfunc_string_merge(s1, s2)
+        sm = unique_paths(s1, s2)
         sm_list = sm.split("\n")
         self.assertEqual(len(sm_list), 2)
         # The order of lines should be maintained with the second string