fix TestTupan::test02 from testing obsolete parameters

Author: elkogerville

src/amuse_tupan/tests/test_tupan.py

@@ -174,52 +174,24 @@ def test01(self):
         instance.cleanup_code()
         instance.stop()
 
-    def xtest02(self):
+    def test02(self):
         if MODULES_MISSING:
             self.skip("Failed to import a module required for Tupan")
-        print("Testing Tupan parameters")
+        print("Testing Tupan default parameters")
         instance = self.new_instance_of_an_optional_code(Tupan, self.default_converter)
         instance.initialize_code()
 
-        self.assertEqual(instance.parameters.epsilon_squared,
-            instance.unit_converter.to_si(0.0 | nbody_system.length**2))
-        self.assertEqual(instance.parameters.timestep_parameter, 0.125)
-
-        for par, value in [('epsilon_squared_star_star', 0.0 | nbody_system.length**2),
-                ('epsilon_squared_star_blackhole', 0.0 | nbody_system.length**2),
-                ('epsilon_squared_blackhole_blackhole', 0.0 | nbody_system.length**2),
-                ('initial_timestep_parameter', 1.0e-4),
-                ('timestep_parameter_stars', 0.1),
-                ('timestep_parameter_supermassive_black_holes', 0.4),
-                ('timestep_parameter_intermediate_mass_black_holes', 0.4),
-                ('max_relative_energy_error', 5.0e-5),
-                ('maximum_timestep', 1.0/1024.0 | nbody_system.time),
-                ('smbh_mass', 1.0 | nbody_system.mass)]:
-            self.assertEqual(instance.unit_converter.to_si(value),
-                getattr(instance.parameters, par))
-            setattr(instance.parameters, par, 3.0 | value.unit)
-            self.assertEqual(instance.unit_converter.to_si(3.0 | value.unit),
-                getattr(instance.parameters, par))
-
-        # epsilon_squared is an alias for epsilon_squared_star_star, so epsilon_squared also has become 3:
-        self.assertEqual(instance.parameters.epsilon_squared,
-            instance.unit_converter.to_si(3.0 | nbody_system.length**2))
-        instance.parameters.epsilon_squared = 0.1 | nbody_system.length**2
-        self.assertEqual(instance.parameters.epsilon_squared,
-            instance.unit_converter.to_si(0.1 | nbody_system.length**2))
-        # timestep_parameter is an alias for timestep_parameter_stars, so timestep_parameter also has become 3:
-        self.assertEqual(instance.parameters.timestep_parameter, 3.0)
-        instance.parameters.timestep_parameter = 0.01
-        self.assertEqual(instance.parameters.timestep_parameter, 0.01)
-
-        self.assertEqual(instance.parameters.include_smbh, False)
-        instance.parameters.include_smbh = True
-        self.assertEqual(instance.parameters.include_smbh, True)
-        self.assertEqual(instance.parameters.calculate_postnewtonian, True)
-        instance.parameters.calculate_postnewtonian = False
-        self.assertEqual(instance.parameters.calculate_postnewtonian, False)
-
-        self.assertEqual(instance.parameters.drink, "Vodka martini. Shaken, not stirred.")
+        self.assertEquals(instance.parameters.timestep_parameter, 0.03125)
+        self.assertEquals(
+            instance.parameters.epsilon_squared,
+            instance.unit_converter.to_si(0.0 | nbody_system.length**2)
+        )
+        self.assertEquals(
+            instance.parameters.begin_time,
+            instance.unit_converter.to_si(0.0 | nbody_system.time)
+        )
+        self.assertEquals(instance.parameters.integrator_method, 'sia21h.dkd')
+        self.assertEquals(instance.parameters.pn_order, 0)
 
         instance.stop()