Skip to content

Fixes Kadabra-JS failing tests#44

Merged
lm-sousa merged 26 commits intolara-dsl-deprecationfrom
fix/kadabra-js-tests
Jan 12, 2026
Merged

Fixes Kadabra-JS failing tests#44
lm-sousa merged 26 commits intolara-dsl-deprecationfrom
fix/kadabra-js-tests

Conversation

@joaobispo
Copy link
Copy Markdown
Member

No description provided.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request fixes failing tests in Kadabra-JS by addressing several API inconsistencies and updating the weaver infrastructure. The changes include fixes to joinpoint wrapping/unwrapping, AST representation, and Android manifest handling.

  • Fixed Timer.ts to correctly access the first element of the insert() method's array return value
  • Added wrapping/unwrapping calls to KadabraNodes.ts methods to properly handle joinpoint conversion
  • Updated Java converters to return more flexible joinpoint types and handle invocations as both expressions and statements
  • Added support for FieldAccess.base attribute and changed AndroidManifest.asJson from Object to String

Reviewed changes

Copilot reviewed 25 out of 25 changed files in this pull request and generated 7 comments.

Show a summary per file
File Description
Kadabra-JS/src-api/kadabra/monitor/Timer.ts Fixed array indexing for insert() return value
Kadabra-JS/src-api/kadabra/KadabraNodes.ts Added wrapJoinPoint/unwrapJoinPoint calls to all factory methods
Kadabra-JS/src-api/Joinpoints.ts Added base getter for FieldAccess joinpoint
Kadabra-JS/jest/KadabraLegacyTester.ts Added constructor to configure output folder
JavaWeaver/test-resources/tests/kadabra/test/weaver/results/CompilationError.js.txt Added expected output for compilation error test
JavaWeaver/test-resources/tests/kadabra/test/weaver/results/Ast.js.txt Updated AST expected output to reflect converter changes
JavaWeaver/test-resources/tests/kadabra/test/weaver/ObjectAccess.js Updated test to use name and base.code instead of typeReference
JavaWeaver/test-resources/tests/kadabra/test/weaver/ConstructorCallMutator.js Changed from searching "reference" to "new" joinpoints
JavaWeaver/test-resources/tests/kadabra/test/weaver/Ast.js Added blank line for formatting
JavaWeaver/test-resources/tests/kadabra/test/weaver/Android.js Changed to parse asJson as string with JSON.parse
JavaWeaver/test-resources/tests/kadabra/test/api/IterativeMutatorTest.js Added blank line for formatting
JavaWeaver/src/weaver/utils/weaving/converters/CtStatement2AStatement.java Changed to use ctInvokation for CtInvocation and return AJavaWeaverJoinPoint
JavaWeaver/src/weaver/utils/weaving/converters/CtExpression2AExpression.java Simplified imports and formatting
JavaWeaver/src/weaver/utils/weaving/converters/CtElement2JoinPoint.java Reorganized imports and formatting
JavaWeaver/src/weaver/utils/weaving/SelectUtils.java Updated return types and commented out unused methods
JavaWeaver/src/weaver/kadabra/joinpoints/JStatement.java Changed newInstance return type to AJavaWeaverJoinPoint
JavaWeaver/src/weaver/kadabra/joinpoints/JFieldAccess.java Implemented getBaseImpl method
JavaWeaver/src/weaver/kadabra/joinpoints/JExpressionStatement.java Formatting changes
JavaWeaver/src/weaver/kadabra/joinpoints/JCallStatement.java Formatting and javadoc ordering
JavaWeaver/src/weaver/kadabra/joinpoints/JCall.java Reorganized imports and removed blank line
JavaWeaver/src/weaver/kadabra/joinpoints/JAndroidManifest.java Implemented getAsJsonImpl to return String
JavaWeaver/src/weaver/kadabra/abstracts/AJavaWeaverJoinPoint.java Changed toAStatement return type and formatting
JavaWeaver/src/weaver/kadabra/JavaWeaver.java Simplified writeCode method implementation
JavaWeaver/resources/specs/kadabra/artifacts.xml Changed asJson type to String and added fieldAccess.base attribute
JavaWeaver/build.gradle Added org.json dependency and reformatted args

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

… a "woven_code" folder inside the given output folder
@lm-sousa lm-sousa merged commit b98c8c2 into lara-dsl-deprecation Jan 12, 2026
9 checks passed
@lm-sousa lm-sousa deleted the fix/kadabra-js-tests branch January 12, 2026 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants