Merge branch '2.6.x' into 2.7.x

Closes gh-32017
This commit is contained in:
Andy Wilkinson
2022-08-09 10:57:44 +01:00
2 changed files with 6 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@ import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.io.ReaderSource;
import org.codehaus.groovy.syntax.Token;
import org.codehaus.groovy.syntax.Types;
import org.codehaus.groovy.transform.ASTTransformation;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -195,8 +197,8 @@ final class ResolveDependencyCoordinatesTransformationTests {
ClassNode classNode = new ClassNode("Test", 0, new ClassNode(Object.class));
this.moduleNode.addClass(classNode);
DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"), null,
new ConstantExpression("test"));
DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"),
new Token(Types.ASSIGN, "=", 1, 1), new ConstantExpression("test"));
declarationExpression.addAnnotation(this.grabAnnotation);
BlockStatement code = new BlockStatement(Arrays.asList(new ExpressionStatement(declarationExpression)),