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

Upgrade CS #771

Closed
wants to merge 3 commits into from
Closed

Upgrade CS #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da21a2b
minor: rename misleading property
pzygielo Jul 27, 2019
77496b5
minor: 8.20 seems to work fine
pzygielo Jul 27, 2019
cf3c946
minor: update CS and UTs accordingly
pzygielo Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ checkstyle-regression)
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
echo sevntu version:$SEVNTU_VERSION
ECLIPSE_CS_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
echo eclipse-cs version:$ECLIPSE_CS_VERSION
mvn -e install -Pno-validations
Expand Down
2 changes: 1 addition & 1 deletion release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ git clean -f -d
git checkout origin/master

cd sevntu-checks
ECLIPSE_CS_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${checkstyle.eclipse-cs.version}' \
ECLIPSE_CS_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
cd ..

Expand Down
16 changes: 8 additions & 8 deletions sevntu-checks/.ci/wercker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ case $1 in

no-exception-struts)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -41,7 +41,7 @@ no-exception-struts)

no-exception-guava)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -60,7 +60,7 @@ no-exception-guava)

no-exception-hibernate-orm)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -79,7 +79,7 @@ no-exception-hibernate-orm)

no-exception-spotbugs)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -98,7 +98,7 @@ no-exception-spotbugs)

no-exception-spring-framework)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -117,7 +117,7 @@ no-exception-spring-framework)

no-exception-hbase)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -136,7 +136,7 @@ no-exception-hbase)

no-exception-Pmd-elasticsearch-lombok-ast)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand All @@ -157,7 +157,7 @@ no-exception-Pmd-elasticsearch-lombok-ast)

no-exception-alot-of-projects)
CS_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' \
-Dexec.args='${checkstyle.eclipse-cs.version}' \
-Dexec.args='${checkstyle.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
SEVNTU_POM_VERSION=$(mvn -e -q -Dexec.executable='echo' -Dexec.args='${project.version}' \
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
Expand Down
14 changes: 7 additions & 7 deletions sevntu-checks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<properties>
<project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
<!-- It is compile dependency to checkstyle, this version has to be the same as eclipse-cs depends on -->
<checkstyle.eclipse-cs.version>8.18</checkstyle.eclipse-cs.version>
<checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.eclipse-cs.version}/config/checkstyle_checks.xml</checkstyle.configLocation>
<checkstyle.version>8.23</checkstyle.version>
Copy link
Contributor

@rnveach rnveach Jul 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

This isn't possible.
Sevntu-checks may be fine, but eclipsecs-sevntu-plugin won't work because eclipse-cs hasn't been upgraded yet.
Sevntu is currently entirely dependent on eclipse-cs version.
New property name is very misleading in that it makes you think it is only a checkstyle dependency and not an eclipse-cs one.

I don't see how this can be merged unless we split apart version numbering between sevntu and eclipsecs-sevntu-plugin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I still can get the meaning of checkstyle.eclipse-cs.version then.
How it is connected with eclipse-cs, given

sevntu.checkstyle/.ci/travis.sh

Lines 15 to 18 in 9765a3b

git clone https://github.com/checkstyle/eclipse-cs.git
cd eclipse-cs/
git checkout 8.12.0
mvn -e install

and

sevntu.checkstyle/eclipsecs-sevntu-plugin/pom.xml

Lines 27 to 31 in 9765a3b

<properties>
<eclipsecs.version>8.12.0-SNAPSHOT</eclipsecs.version>
</properties>

Is that rather CS - eclipse-cs - sevntu compatibility level or something?
How does checkstyle.eclipse-cs.version influence dependency to eclipse-cs?

Copy link
Contributor

@rnveach rnveach Jul 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Sevntu is a library, just like checkstyle. Sevntu requires the checkstyle dependency.

eclipsecs-sevntu-plugin is a plugin which has sevntu as a dependency.
https://github.com/sevntu-checkstyle/sevntu.checkstyle/blob/master/eclipsecs-sevntu-plugin/pom.xml#L34-L36
It also has a dependency on the main eclipse-cs project which requires it's own checkstyle version.
https://github.com/sevntu-checkstyle/sevntu.checkstyle/blob/master/eclipsecs-sevntu-plugin/pom.xml#L38-L47

This is the great circle of life.

So eclipsecs-sevntu-plugin for version X requires sevntu version X which then relies on checkstyle version Y through sevntu and checkstyle version Y through eclipse-cs.

If you upgrade checkstyle version to Z, sevntu pulls that in and may work fine by itself. The problem is then eclipsecs-sevntu-plugin pulls in that same sevntu version and tries to work with that version of checkstyle while also working with eclipse-cs version of checkstyle which we know isn't version Z.
Since 2 versions aren't compatible by the updates you are required to make in this PR, something will break if we move sevntu's checkstyle version to be later than what eclipse-cs has released.

The only way to really fix this issue is either have eclipse-cs update to newer versions or break our current versioning system and allow eclipsecs-sevntu-plugin to stay stale until eclipse-cs is updated and allow new releases of sevntu alone.

I hope that helps explain the problem better.

Copy link
Contributor

@rnveach rnveach Jul 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

sevntu.checkstyle/.ci/travis.sh

Lines 15 to 18 in 9765a3b

git clone https://github.com/checkstyle/eclipse-cs.git
cd eclipse-cs/
git checkout 8.12.0
mvn -e install

Since sevntu is on checkstyle 8.18 , it looks like this SH file is outdated by displaying 8.12 unless I am missing something.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for your rich response.

allow eclipsecs-sevntu-plugin to stay stale until eclipse-cs is updated and allow new releases of sevntu alone.

[As I do not use that plugin...] I'd second such solution! 😁

I hope that helps explain the problem better.

Indeed it does, thank you.

Copy link
Contributor

Choose a reason for hiding this comment

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

@romani ping

Copy link
Contributor Author

Choose a reason for hiding this comment

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

allow eclipsecs-sevntu-plugin to stay stale until eclipse-cs is updated and allow new releases of sevntu alone.

Yesterday I was enthusiastic about that idea as it would solve my problem. But now that I put some boxes and arrows on paper I really like that. (Not for plugin to be stale, but to separate them.) And perhaps sonar plugin as well...

Oh, I just found #705, I'll get familiar with that. It has no labels nor milestones set though. I assume you are processing it in background anyway.

Copy link
Contributor

Choose a reason for hiding this comment

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

I put an approved label on it. We don't put on milestones until it is completed.

<checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${checkstyle.version}/config/checkstyle_checks.xml</checkstyle.configLocation>
<checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
<sevntu.maven.plugin>RELEASE</sevntu.maven.plugin>
<maven.pmd.plugin.version>3.11.0</maven.pmd.plugin.version>
Expand All @@ -36,15 +36,15 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.eclipse-cs.version}</version>
<version>${checkstyle.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${checkstyle.eclipse-cs.version}</version>
<version>${checkstyle.version}</version>
</dependency>
<!-- required for Jsr305AnnotationsCheck -->
<dependency>
Expand Down Expand Up @@ -239,7 +239,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.eclipse-cs.version}</version>
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -365,7 +365,7 @@
<classpathScope>test</classpathScope>
<arguments>
<classpath/>
<argument>${checkstyle.eclipse-cs.version}</argument>
<argument>${checkstyle.version}</argument>
</arguments>
</configuration>
</plugin>
Expand Down Expand Up @@ -402,7 +402,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.eclipse-cs.version}</version>
<version>${checkstyle.version}</version>
</dependency>
<!-- attention here is self-referencing, so be sure you did "mvn install" before "mvn verify -Pselftesting" -->
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions ...test/java/com/github/sevntu/checkstyle/checks/coding/AvoidModifiersForTypesCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

/**
Expand Down Expand Up @@ -291,26 +291,26 @@ public void testAnyFile() throws Exception {
*/
@Test
public void testUnsupportedModifier() {
final DetailAST sync = new DetailAST();
final DetailAstImpl sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

final DetailAST ident = new DetailAST();
final DetailAstImpl ident = new DetailAstImpl();
ident.setType(TokenTypes.IDENT);
ident.setText("dummy");

final DetailAST type = new DetailAST();
final DetailAstImpl type = new DetailAstImpl();
type.setType(TokenTypes.TYPE);
type.addChild(ident);

final DetailAST child = new DetailAST();
final DetailAstImpl child = new DetailAstImpl();
child.setType(TokenTypes.MODIFIERS);
child.addChild(sync);

final DetailAST node = new DetailAST();
final DetailAstImpl node = new DetailAstImpl();
node.addChild(type);
node.addChild(child);

final DetailAST parent = new DetailAST();
final DetailAstImpl parent = new DetailAstImpl();
parent.setType(TokenTypes.OBJBLOCK);
parent.addChild(node);

Expand Down
3 changes: 2 additions & 1 deletion ...test/java/com/github/sevntu/checkstyle/checks/coding/EmptyPublicCtorInClassCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

public class EmptyPublicCtorInClassCheckTest extends AbstractModuleTestSupport {
Expand Down Expand Up @@ -176,7 +177,7 @@ public void testNullProperties2() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...c/test/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainImportsCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

/**
Expand Down Expand Up @@ -200,7 +201,7 @@ public void testSinglePackage() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...rc/test/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainMethodCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

public class ForbidCertainMethodCheckTest extends AbstractModuleTestSupport {
Expand Down Expand Up @@ -151,7 +152,7 @@ public void testWithRegexForMethodName() throws Exception {

@Test
public void testUnsupportedToken() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);
try {
final ForbidCertainMethodCheck check = new ForbidCertainMethodCheck();
Expand Down
3 changes: 2 additions & 1 deletion ...rc/test/java/com/github/sevntu/checkstyle/checks/coding/ForbidInstantiationCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

/**
Expand Down Expand Up @@ -126,7 +127,7 @@ public void testAsteriskInInput() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion .../src/test/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;

Expand Down Expand Up @@ -379,7 +380,7 @@ public void testExcludePackage() throws Exception {
*/
@Test
public void testHandleDefinition() throws Exception {
final DetailAST ast = new DetailAST();
final DetailAST ast = new DetailAstImpl();
ast.setType(TokenTypes.WILDCARD_TYPE);

final Method handleDefinition =
Expand Down
3 changes: 2 additions & 1 deletion ...ks/src/test/java/com/github/sevntu/checkstyle/checks/coding/RedundantReturnCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

public class RedundantReturnCheckTest extends AbstractModuleTestSupport {
Expand Down Expand Up @@ -149,7 +150,7 @@ public void testSomeFalsePositiveCase()

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...va/com/github/sevntu/checkstyle/checks/coding/RequireFailForTryCatchInJunitCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.utils.CommonUtil;

Expand Down Expand Up @@ -97,7 +98,7 @@ public void testGood() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
5 changes: 3 additions & 2 deletions .../java/com/github/sevntu/checkstyle/checks/coding/ReturnNullInsteadOfBooleanCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

public class ReturnNullInsteadOfBooleanCheckTest extends AbstractModuleTestSupport {
Expand All @@ -52,7 +53,7 @@ public void testDefault() throws Exception {

@Test
public void testUnsupportedNodeVisit() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand All @@ -68,7 +69,7 @@ public void testUnsupportedNodeVisit() {

@Test
public void testUnsupportedNodeLeave() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...est/java/com/github/sevntu/checkstyle/checks/design/AvoidConditionInversionCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

/**
Expand Down Expand Up @@ -86,7 +87,7 @@ public void avoidOnlyRelationalOperandsInCondition() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...t/java/com/github/sevntu/checkstyle/checks/design/CauseParameterInExceptionCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

/**
Expand Down Expand Up @@ -160,7 +161,7 @@ public void testStrangeSituation4() throws Exception {

@Test
public void testUnsupportedNode() {
final DetailAST sync = new DetailAST();
final DetailAST sync = new DetailAstImpl();
sync.setType(TokenTypes.LITERAL_SYNCHRONIZED);

try {
Expand Down
3 changes: 2 additions & 1 deletion ...c/test/java/com/github/sevntu/checkstyle/checks/design/CheckstyleTestMakeupCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.DetailAstImpl;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;

public class CheckstyleTestMakeupCheckTest extends AbstractModuleTestSupport {
Expand Down Expand Up @@ -113,7 +114,7 @@ public void testInvalidFileIgnoreCreates() throws Exception {

@Test
public void testInvalidToken() {
final DetailAST parent = new DetailAST();
final DetailAST parent = new DetailAstImpl();
parent.setType(TokenTypes.OBJBLOCK);

final CheckstyleTestMakeupCheck check = new CheckstyleTestMakeupCheck();
Expand Down
Loading