Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1526 move testResource macro to core #1531

Merged
merged 25 commits into from
Oct 25, 2024
Merged

1526 move testResource macro to core #1531

merged 25 commits into from
Oct 25, 2024

Conversation

AndreaLaGrotteria
Copy link
Collaborator

No description provided.

AndreaLaGrotteria and others added 23 commits October 23, 2024 14:18
@AndreaLaGrotteria
Adds rawTest macro and tests. Fix #1524.
9e05a85
@AndreaLaGrotteria
Fixes spaces.
356ae11
@AndreaLaGrotteria
Fixes spaces.
cdff572
@AndreaLaGrotteria
Adds resource macro and tests. Fix #1525.
e72201d
@AndreaLaGrotteria
Apply requested changes.
e0ed37e
@AndreaLaGrotteria
Apply requested changes.
0633bde
@AndreaLaGrotteria
Apply requested changes.
c830ca7
@AndreaLaGrotteria
Apply requested changes.
f72d259
@AndreaLaGrotteria
Fix for header lines offset.
857651f
@AndreaLaGrotteria
Implements suggestions.
0a6b4c1
@sdelamo
fix tests
e972324
@sdelamo
add @nullability annotation
6a8e709
@sdelamo
license lines is 0 don’t add lines attributes
adc0585
@AndreaLaGrotteria
Adds testResource macro to core. Fix #1526.
58fe4fb
@AndreaLaGrotteria
Adds supports for multi-line inputs. Makes code more modular.
d8c08e6
@AndreaLaGrotteria
Adds supports for multi-line inputs. Makes code more modular.
c645194
@AndreaLaGrotteria
Adds supports for multi-line inputs. Makes code more modular.
eb82a83
@AndreaLaGrotteria
Improves path display.
b295ee6
@AndreaLaGrotteria
Adds annotations.
e9d59d2
@AndreaLaGrotteria
Adds annotations.
c0f3f79
@AndreaLaGrotteria
Adds resourceMacro and tests. Fix #1525.
9d500ea
@AndreaLaGrotteria
Merge branch '1525-move-resource-macro-to-core' into 1526-move-testre…
2329684 
…source-macro-to-core

# Conflicts:
#	buildSrc/src/main/java/io/micronaut/guides/core/MacroUtils.java
#	buildSrc/src/main/java/io/micronaut/guides/core/ResourceMacroSubstitution.java
#	buildSrc/src/test/java/io/micronaut/guides/core/ResourceMacroSubstitutionTest.java
@AndreaLaGrotteria
Adapts code to merged changes.
60426d9
@AndreaLaGrotteria AndreaLaGrotteria self-assigned this Oct 24, 2024
@AndreaLaGrotteria AndreaLaGrotteria linked an issue Oct 24, 2024 that may be closed by this pull request
Move testResource macro to core #1526
Closed
@AndreaLaGrotteria AndreaLaGrotteria changed the title 1526 move testresource macro to core 1526 move testResource macro to core Oct 24, 2024
sdelamo
sdelamo requested changes Oct 25, 2024
View reviewed changes
Copy link
Contributor

@sdelamo sdelamo left a comment

Choose a reason for hiding this comment

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

Can you merge master into this PR

@AndreaLaGrotteria
Merge branch 'master' into 1526-move-testresource-macro-to-core
0d725e1 
# Conflicts:
#	buildSrc/src/main/java/io/micronaut/guides/core/MacroUtils.java
#	buildSrc/src/main/java/io/micronaut/guides/core/RawTestMacroSubstitution.java
#	buildSrc/src/test/java/io/micronaut/guides/core/MacroUtilsTest.java
#	buildSrc/src/test/java/io/micronaut/guides/core/ResourceMacroSubstitutionTest.java
#	buildSrc/src/test/java/io/micronaut/guides/core/TestMacroSubstitutionTest.java
@AndreaLaGrotteria
Bug fix.
f2a0a68
@sdelamo sdelamo merged commit 8419268 into master Oct 25, 2024
1 of 2 checks passed
@sdelamo sdelamo deleted the 1526-move-testresource-macro-to-core branch October 25, 2024 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sdelamo sdelamo sdelamo approved these changes

Assignees

@AndreaLaGrotteria AndreaLaGrotteria

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move testResource macro to core
2 participants
@AndreaLaGrotteria @sdelamo