sdilts · sdilts · Jan 19, 2026 · Jan 19, 2026 · Jan 19, 2026
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -24,9 +24,12 @@ jobs:
       run: |
         pip install .
         pip uninstall -y clang
-    - name: Run Tests
+    - name: Run Unit Tests
       run: |
-        python test/run_tests.py
+        python -m unittest
+    - name: Run Integration tests
+      run: |
+        python integrated/run_tests.py
   lint:
     runs-on: ubuntu-latest
     steps:

diff --git a/cl_bindgen/mangler.py b/cl_bindgen/mangler.py
@@ -108,12 +108,15 @@ def __init__(self):
     def can_mangle(self, string):
         return len(string) > 0
 
+    def _should_add_dash(self, cur_char, prev):
+        return cur_char.isupper() and not prev.isupper() and prev.isalnum()
+
     def mangle(self, string):
         builder = io.StringIO()
         builder.write(string[0].lower())
         for i in range(1, len(string)):
             cur_char = string[i]
-            if cur_char.isupper() and not string[i-1].isupper():
+            if self._should_add_dash(cur_char, string[i-1]):
                 builder.write('-')
             builder.write(cur_char.lower())
         return builder.getvalue()
diff --git a/test/framework.py → integrated/framework.py b/test/framework.py → integrated/framework.py
diff --git a/test/inputs/builtin_pointers.h → integrated/inputs/builtin_pointers.h b/test/inputs/builtin_pointers.h → integrated/inputs/builtin_pointers.h
diff --git a/test/inputs/capitalization.h → integrated/inputs/capitalization.h b/test/inputs/capitalization.h → integrated/inputs/capitalization.h
diff --git a/test/inputs/constant_array_in_struct.h → integrated/inputs/constant_array_in_struct.h b/test/inputs/constant_array_in_struct.h → integrated/inputs/constant_array_in_struct.h
diff --git a/test/inputs/forward_declaration.h → integrated/inputs/forward_declaration.h b/test/inputs/forward_declaration.h → integrated/inputs/forward_declaration.h
diff --git a/test/inputs/function_pointer.h → integrated/inputs/function_pointer.h b/test/inputs/function_pointer.h → integrated/inputs/function_pointer.h
diff --git a/test/inputs/header_guard.h → integrated/inputs/header_guard.h b/test/inputs/header_guard.h → integrated/inputs/header_guard.h
diff --git a/test/inputs/header_guard_path.h → integrated/inputs/header_guard_path.h b/test/inputs/header_guard_path.h → integrated/inputs/header_guard_path.h
diff --git a/test/inputs/macro_constant.h → integrated/inputs/macro_constant.h b/test/inputs/macro_constant.h → integrated/inputs/macro_constant.h
diff --git a/test/inputs/macro_constant_invalid.h → integrated/inputs/macro_constant_invalid.h b/test/inputs/macro_constant_invalid.h → integrated/inputs/macro_constant_invalid.h
diff --git a/test/inputs/nested_anonymous_records.h → integrated/inputs/nested_anonymous_records.h b/test/inputs/nested_anonymous_records.h → integrated/inputs/nested_anonymous_records.h
diff --git a/test/inputs/nested_struct.h → integrated/inputs/nested_struct.h b/test/inputs/nested_struct.h → integrated/inputs/nested_struct.h
diff --git a/test/inputs/simple_struct.h → integrated/inputs/simple_struct.h b/test/inputs/simple_struct.h → integrated/inputs/simple_struct.h
diff --git a/test/inputs/standard_types.h → integrated/inputs/standard_types.h b/test/inputs/standard_types.h → integrated/inputs/standard_types.h
diff --git a/test/inputs/typedef.h → integrated/inputs/typedef.h b/test/inputs/typedef.h → integrated/inputs/typedef.h
diff --git a/test/outputs/builtin-pointers.lisp → integrated/outputs/builtin-pointers.lisp b/test/outputs/builtin-pointers.lisp → integrated/outputs/builtin-pointers.lisp
diff --git a/test/outputs/capitalization.lisp → integrated/outputs/capitalization.lisp b/test/outputs/capitalization.lisp → integrated/outputs/capitalization.lisp
diff --git a/test/outputs/constant-array-in-struct.lisp → ...ted/outputs/constant-array-in-struct.lisp b/test/outputs/constant-array-in-struct.lisp → ...ted/outputs/constant-array-in-struct.lisp
diff --git a/test/outputs/forward_declaration.lisp → integrated/outputs/forward_declaration.lisp b/test/outputs/forward_declaration.lisp → integrated/outputs/forward_declaration.lisp
diff --git a/test/outputs/function-pointer.lisp → integrated/outputs/function-pointer.lisp b/test/outputs/function-pointer.lisp → integrated/outputs/function-pointer.lisp
diff --git a/test/outputs/header-guard-path.lisp → integrated/outputs/header-guard-path.lisp b/test/outputs/header-guard-path.lisp → integrated/outputs/header-guard-path.lisp
diff --git a/test/outputs/header-guard.lisp → integrated/outputs/header-guard.lisp b/test/outputs/header-guard.lisp → integrated/outputs/header-guard.lisp
diff --git a/test/outputs/macro-constant-invalid.lisp → ...rated/outputs/macro-constant-invalid.lisp b/test/outputs/macro-constant-invalid.lisp → ...rated/outputs/macro-constant-invalid.lisp
diff --git a/test/outputs/macro-constant.lisp → integrated/outputs/macro-constant.lisp b/test/outputs/macro-constant.lisp → integrated/outputs/macro-constant.lisp
diff --git a/test/outputs/nested-anonymous-records.lisp → ...ted/outputs/nested-anonymous-records.lisp b/test/outputs/nested-anonymous-records.lisp → ...ted/outputs/nested-anonymous-records.lisp
diff --git a/test/outputs/nested-struct.lisp → integrated/outputs/nested-struct.lisp b/test/outputs/nested-struct.lisp → integrated/outputs/nested-struct.lisp
diff --git a/test/outputs/simple-struct.lisp → integrated/outputs/simple-struct.lisp b/test/outputs/simple-struct.lisp → integrated/outputs/simple-struct.lisp
diff --git a/test/outputs/standard_types.lisp → integrated/outputs/standard_types.lisp b/test/outputs/standard_types.lisp → integrated/outputs/standard_types.lisp
diff --git a/test/outputs/typedef.lisp → integrated/outputs/typedef.lisp b/test/outputs/typedef.lisp → integrated/outputs/typedef.lisp
diff --git a/test/run_tests.py → integrated/run_tests.py b/test/run_tests.py → integrated/run_tests.py
diff --git a/test/__init__.py b/test/__init__.py
@@ -0,0 +1,2 @@
+""" Unit Test Suite for cl-bindgen
+"""
diff --git a/test/test_CamelCaseConverter.py b/test/test_CamelCaseConverter.py
@@ -0,0 +1,30 @@
+import unittest
+
+from cl_bindgen.mangler import CamelCaseConverter
+
+class CamelCaseConverterTest(unittest.TestCase):
+    mangler = CamelCaseConverter()
+
+    def test_title_case_converts(self):
+        result = self.mangler.mangle('TestTitleCase')
+        self.assertEqual('test-title-case', result)
+
+    def test_converts_camelcase(self):
+        result = self.mangler.mangle('camelCase')
+        self.assertEqual('camel-case', result)
+
+    def test_converts_all_lowercase(self):
+        result = self.mangler.mangle('camels')
+        self.assertEqual('camels', result)
+
+    def test_converts_consective_at_end(self):
+        result = self.mangler.mangle('ThingDNE')
+        self.assertEqual('thing-dne', result)
+
+    def test_converts_consective_at_begining(self):
+        result = self.mangler.mangle('IString')
+        self.assertEqual('istring', result)
+
+    def test_converts_snakecase_names(self):
+        result = self.mangler.mangle('GRAVITY_TOP_RIGHT')
+        self.assertEqual('gravity_top_right', result)