Test suite modernization

tests/regression/issue_76_test.py

@@ -17,72 +17,68 @@ class CustomEntity(mcrfpy.Entity):
     def custom_method(self):
         return "Custom method called"
 
-def run_test(timer, runtime):
-    """Test that derived entity classes maintain their type in collections"""
-    try:
-        # Create a grid
-        grid = mcrfpy.Grid(grid_size=(10, 10))
-
-        # Create instances of base and derived entities
-        base_entity = mcrfpy.Entity((1, 1))
-        custom_entity = CustomEntity((2, 2))
-        
-        # Add them to the grid's entity collection
-        grid.entities.append(base_entity)
-        grid.entities.append(custom_entity)
-        
-        # Retrieve them back
-        retrieved_base = grid.entities[0]
-        retrieved_custom = grid.entities[1]
-        
-        print(f"Base entity type: {type(retrieved_base)}")
-        print(f"Custom entity type: {type(retrieved_custom)}")
-        
-        # Test 1: Check if base entity is correct type
-        if type(retrieved_base).__name__ == "Entity":
-            print("✓ Test 1 PASSED: Base entity maintains correct type")
-        else:
-            print("✗ Test 1 FAILED: Base entity has wrong type")
-        
-        # Test 2: Check if custom entity maintains its derived type
-        if type(retrieved_custom).__name__ == "CustomEntity":
-            print("✓ Test 2 PASSED: Derived entity maintains correct type")
-            
-            # Test 3: Check if custom attributes are preserved
-            try:
-                attr = retrieved_custom.custom_attribute
-                method_result = retrieved_custom.custom_method()
-                print(f"✓ Test 3 PASSED: Custom attributes preserved - {attr}, {method_result}")
-            except AttributeError as e:
-                print(f"✗ Test 3 FAILED: Custom attributes lost - {e}")
-        else:
-            print("✗ Test 2 FAILED: Derived entity type lost!")
-            print("This is the bug described in Issue #76!")
-            
-            # Try to access custom attributes anyway
-            try:
-                attr = retrieved_custom.custom_attribute
-                print(f"  - Has custom_attribute: {attr} (but wrong type)")
-            except AttributeError:
-                print("  - Lost custom_attribute")
-        
-        # Test 4: Check iteration
-        print("\nTesting iteration:")
-        for i, entity in enumerate(grid.entities):
-            print(f"  Entity {i}: {type(entity).__name__}")
-        
-        print("\nTest complete")
-        
-    except Exception as e:
-        print(f"Test error: {e}")
-        import traceback
-        traceback.print_exc()
-    
-    sys.exit(0)
-
 # Set up the test scene
 test = mcrfpy.Scene("test")
-test.activate()
+mcrfpy.current_scene = test
 
-# Schedule test to run after game loop starts
-test_timer = mcrfpy.Timer("test", run_test, 100, once=True)
+# Run the test
+try:
+    # Create a grid
+    grid = mcrfpy.Grid(grid_size=(10, 10))
+
+    # Create instances of base and derived entities
+    base_entity = mcrfpy.Entity((1, 1))
+    custom_entity = CustomEntity((2, 2))
+
+    # Add them to the grid's entity collection
+    grid.entities.append(base_entity)
+    grid.entities.append(custom_entity)
+
+    # Retrieve them back
+    retrieved_base = grid.entities[0]
+    retrieved_custom = grid.entities[1]
+
+    print(f"Base entity type: {type(retrieved_base)}")
+    print(f"Custom entity type: {type(retrieved_custom)}")
+
+    # Test 1: Check if base entity is correct type
+    if type(retrieved_base).__name__ == "Entity":
+        print("PASS: Test 1 - Base entity maintains correct type")
+    else:
+        print("FAIL: Test 1 - Base entity has wrong type")
+
+    # Test 2: Check if custom entity maintains its derived type
+    if type(retrieved_custom).__name__ == "CustomEntity":
+        print("PASS: Test 2 - Derived entity maintains correct type")
+
+        # Test 3: Check if custom attributes are preserved
+        try:
+            attr = retrieved_custom.custom_attribute
+            method_result = retrieved_custom.custom_method()
+            print(f"PASS: Test 3 - Custom attributes preserved - {attr}, {method_result}")
+        except AttributeError as e:
+            print(f"FAIL: Test 3 - Custom attributes lost - {e}")
+    else:
+        print("FAIL: Test 2 - Derived entity type lost!")
+        print("This is the bug described in Issue #76!")
+
+        # Try to access custom attributes anyway
+        try:
+            attr = retrieved_custom.custom_attribute
+            print(f"  - Has custom_attribute: {attr} (but wrong type)")
+        except AttributeError:
+            print("  - Lost custom_attribute")
+
+    # Test 4: Check iteration
+    print("\nTesting iteration:")
+    for i, entity in enumerate(grid.entities):
+        print(f"  Entity {i}: {type(entity).__name__}")
+
+    print("\nTest complete")
+
+except Exception as e:
+    print(f"Test error: {e}")
+    import traceback
+    traceback.print_exc()
+
+sys.exit(0)