Better tests

Author: elifarley

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
 ]
 keywords = ["cedarscript", "code-editing", "refactoring", "code-analysis", "sql-like", "ai-assisted-development"]
 dependencies = [
-    "cedarscript-ast-parser>=0.5.1",
+    "cedarscript-ast-parser>=0.5.2",
     "grep-ast==0.3.3",
     "tree-sitter-languages==1.10.2",
 ]

tests/corpus/.refactoring-benchmark/chat.xml

@@ -45,6 +45,32 @@ POSTPONED =- [-4 -> -3] ( -------------------) (++++++++++++++++++++) codeeditor
 =- [-4 -> -3] ( -------------------) (++++++++++++++++++++) symbolic_shapes_ShapeEnv_bind_symbols
 =- [-4 -> -3] (   -----------------) (+++++++++++++       ) text_CountVectorizer__limit_features
 
+    --
+
+- dirname: 2024-11-04-06-01-55--gemini-1.5-flash-refactoring-cedarscript-i1.1.3-e1.1.7
+test_cases: 89
+model: gemini/gemini-1.5-flash-latest
+edit_format: cedarscript
+commit_hash: 82ac553
+pass_rate_1: 84.3
+pass_rate_2: 84.3
+pass_rate_3: 85.4
+percent_cases_well_formed: 93.3
+error_outputs: 134
+num_malformed_responses: 28
+num_with_malformed_responses: 6
+user_asks: 35
+lazy_comments: 0
+syntax_errors: 6
+indentation_errors: 3
+exhausted_context_windows: 0
+test_timeouts: 0
+command: aider --model gemini/gemini-1.5-flash-latest
+date: 2024-11-04
+versions: 0.60.2.dev
+seconds_per_case: 17.1
+total_cost: 0.6229
+
 </report>
 
 <no-train>

tests/corpus/apply-relative-indents/chat.xml

@@ -0,0 +1,47 @@
+<no-train>
+```CEDARScript
+UPDATE METHOD "Luhn.__init__"
+FROM FILE "luhn.py"
+REPLACE BODY
+WITH CONTENT r'''
+self.card_num = card_num.replace(" ", "")
+''';
+
+UPDATE METHOD "Luhn.valid"
+FROM FILE "luhn.py"
+REPLACE BODY
+WITH CONTENT r'''
+if len(self.card_num) <= 1:
+    if 1 < 1
+        if 1 < 1:
+            return True
+    return False
+    # \x
+return checksum % 10 == 0
+''';
+```
+
+```CEDARScript
+UPDATE METHOD "Luhn.__init__"
+FROM FILE "luhn2.py"
+REPLACE BODY
+WITH CONTENT r'''
+@0:self.card_num = card_num.replace(" ", "")
+''';
+
+UPDATE METHOD "Luhn.valid"
+FROM FILE "luhn2.py"
+REPLACE BODY
+WITH CONTENT r'''
+@0:if len(self.card_num) <= 1:
+@1:if 1 < 1
+@2:if 1 < 1:
+@3:return True
+@1:return False
+@1:# \x
+@0:return checksum % 10 == 0
+''';
+
+```
+
+</no-train>

tests/corpus/apply-relative-indents/expected.luhn.py

@@ -0,0 +1,13 @@
+class A:
+    class Luhn:
+        def __init__(self, card_num):
+            self.card_num = card_num.replace(" ", "")
+
+        def valid(self):
+            if len(self.card_num) <= 1:
+                if 1 < 1
+                    if 1 < 1:
+                        return True
+                return False
+                # \x
+            return checksum % 10 == 0

tests/corpus/apply-relative-indents/expected.luhn2.py

@@ -0,0 +1,13 @@
+class A:
+    class Luhn:
+        def __init__(self, card_num):
+            self.card_num = card_num.replace(" ", "")
+
+        def valid(self):
+            if len(self.card_num) <= 1:
+                if 1 < 1
+                    if 1 < 1:
+                        return True
+                return False
+                # \x
+            return checksum % 10 == 0

tests/corpus/apply-relative-indents/luhn.py

@@ -0,0 +1,7 @@
+class A:
+    class Luhn:
+        def __init__(self, card_num):
+            pass
+
+        def valid(self):
+            pass

tests/corpus/refactor-benchmark.indentation-size-discovery/base.py

@@ -102,12 +102,12 @@ def load_middleware(self, is_async=False):
         self._middleware_chain = handler
 
     def adapt_method_mode(
-            self,
-            is_async,
-            method,
-            method_is_async=None,
-            debug=False,
-            name=None,
+        self,
+        is_async,
+        method,
+        method_is_async=None,
+        debug=False,
+        name=None,
     ):
         """
         Adapt a method to be in the correct "mode":
@@ -214,7 +214,7 @@ def _get_response(self, request):
                     response,
                     middleware_method,
                     name="%s.process_template_response"
-                         % (middleware_method.__self__.__class__.__name__,),
+                    % (middleware_method.__self__.__class__.__name__,),
                 )
             try:
                 response = response.render()
@@ -275,7 +275,7 @@ async def _get_response_async(self, request):
                     response,
                     middleware_method,
                     name="%s.process_template_response"
-                         % (middleware_method.__self__.__class__.__name__,),
+                    % (middleware_method.__self__.__class__.__name__,),
                 )
             try:
                 if asyncio.iscoroutinefunction(response.render):

tests/corpus/refactor-benchmark.indentation-size-discovery/expected.base.py

@@ -18,12 +18,12 @@
 
 
 def adapt_method_mode(
-        self,
-        is_async,
-        method,
-        method_is_async=None,
-        debug=False,
-        name=None,
+    self,
+    is_async,
+    method,
+    method_is_async=None,
+    debug=False,
+    name=None,
 ):
     """
     Adapt a method to be in the correct "mode":
@@ -214,7 +214,7 @@ def _get_response(self, request):
                     response,
                     middleware_method,
                     name="%s.process_template_response"
-                         % (middleware_method.__self__.__class__.__name__,),
+                    % (middleware_method.__self__.__class__.__name__,),
                 )
             try:
                 response = response.render()
@@ -275,7 +275,7 @@ async def _get_response_async(self, request):
                     response,
                     middleware_method,
                     name="%s.process_template_response"
-                         % (middleware_method.__self__.__class__.__name__,),
+                    % (middleware_method.__self__.__class__.__name__,),
                 )
             try:
                 if asyncio.iscoroutinefunction(response.render):