Polish static nested test classes (#2531)

Nazukin-Dmitry · github-actions[bot] · velo · web-flow · commit f2e8a946dda9 · 2024-09-02T14:20:39.000Z
* Polish static nested test classes -Remove @nested annotaion -Some renaming to follow test naming convention -Setup maven-surefire-plugin to execute tatic nested test classes * Update pom.xml Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Dmitrii Nazukin <15947012+Nazukin-Dmitry@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marvin <velo@users.noreply.github.com>
diff --git a/core/src/test/java/feign/EnumForNameTest.java b/core/src/test/java/feign/EnumForNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 The Feign Authors
+ * Copyright 2012-2024 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,15 +16,13 @@
 import static feign.Util.enumForName;
 import static org.assertj.core.api.Assertions.assertThat;
 import java.util.Arrays;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import feign.Request.ProtocolVersion;
 
 public class EnumForNameTest {
 
-  @Nested
-  public static class KnownEnumValues {
+  public static class KnownEnumValuesTest {
     public Object name;
     public ProtocolVersion expectedProtocolVersion;
 
@@ -54,8 +52,7 @@ public void initKnownEnumValues(Object name, ProtocolVersion expectedProtocolVer
 
   }
 
-  @Nested
-  public static class UnknownEnumValues {
+  public static class UnknownEnumValuesTest {
 
     public Object name;
 
diff --git a/core/src/test/java/feign/LoggerTest.java b/core/src/test/java/feign/LoggerTest.java
@@ -45,7 +45,6 @@ String login(@Param("customer_name") String customer,
                  @Param("password") String password);
   }
 
-  @Nested
   public static class LogLevelEmitsTest extends LoggerTest {
 
     private Level logLevel;
@@ -98,8 +97,7 @@ void levelEmits(Level logLevel, List<String> expectedMessages) {
     }
   }
 
-  @Nested
-  public static class ReasonPhraseOptional extends LoggerTest {
+  public static class ReasonPhraseOptionalTest extends LoggerTest {
 
     private Level logLevel;
 
@@ -128,7 +126,6 @@ void reasonPhraseOptional(Level logLevel, List<String> expectedMessages) {
     }
   }
 
-  @Nested
   public static class HttpProtocolVersionTest extends LoggerTest {
 
     private Level logLevel;
@@ -174,7 +171,6 @@ void httpProtocolVersion(Level logLevel,
     }
   }
 
-  @Nested
   public static class ReadTimeoutEmitsTest extends LoggerTest {
 
     private Level logLevel;
@@ -231,7 +227,6 @@ public Retryer clone() {
     }
   }
 
-  @Nested
   public static class UnknownHostEmitsTest extends LoggerTest {
 
     private Level logLevel;
@@ -283,7 +278,6 @@ public Retryer clone() {
     }
   }
 
-  @Nested
   public static class FormatCharacterTest extends LoggerTest {
 
     private Level logLevel;
@@ -335,7 +329,6 @@ public Retryer clone() {
     }
   }
 
-  @Nested
   public static class RetryEmitsTest extends LoggerTest {
 
     private Level logLevel;
diff --git a/core/src/test/java/feign/MethodInfoTest.java b/core/src/test/java/feign/MethodInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 The Feign Authors
+ * Copyright 2012-2024 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -18,14 +18,12 @@
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 
 
 public class MethodInfoTest {
 
-  @Nested
   static class AsyncClientTest {
     public interface AsyncClient {
       CompletableFuture<String> log();
@@ -39,7 +37,6 @@ void completableFutureOfString() throws Exception {
     }
   }
 
-  @Nested
   static class GenericAsyncClientTest {
     public interface GenericAsyncClient<T> {
       T log();
@@ -56,7 +53,6 @@ void genericCompletableFutureOfString() throws Exception {
     }
   }
 
-  @Nested
   static class SyncClientTest {
     public interface SyncClient {
       String log();
@@ -70,7 +66,6 @@ void string() throws Exception {
     }
   }
 
-  @Nested
   static class GenericSyncClientTest {
     public interface GenericSyncClient<T> {
       T log();
diff --git a/pom.xml b/pom.xml
@@ -479,6 +479,9 @@
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <trimStackTrace>false</trimStackTrace>
             <argLine>${jvm.options}</argLine>
+            <excludes>
+              <exclude></exclude>
+            </excludes>
           </configuration>
         </plugin>
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ String login(@Param("customer_name") String customer,`
`45`	`45`	`@Param("password") String password);`
`46`	`46`	`}`
`47`	`47`
`48`		`- @Nested`
`49`	`48`	`public static class LogLevelEmitsTest extends LoggerTest {`
`50`	`49`
`51`	`50`	`private Level logLevel;`
`@@ -98,8 +97,7 @@ void levelEmits(Level logLevel, List<String> expectedMessages) {`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`101`		`- @Nested`
`102`		`- public static class ReasonPhraseOptional extends LoggerTest {`
	`100`	`+ public static class ReasonPhraseOptionalTest extends LoggerTest {`
`103`	`101`
`104`	`102`	`private Level logLevel;`
`105`	`103`
`@@ -128,7 +126,6 @@ void reasonPhraseOptional(Level logLevel, List<String> expectedMessages) {`
`128`	`126`	`}`
`129`	`127`	`}`
`130`	`128`
`131`		`- @Nested`
`132`	`129`	`public static class HttpProtocolVersionTest extends LoggerTest {`
`133`	`130`
`134`	`131`	`private Level logLevel;`
`@@ -174,7 +171,6 @@ void httpProtocolVersion(Level logLevel,`
`174`	`171`	`}`
`175`	`172`	`}`
`176`	`173`
`177`		`- @Nested`
`178`	`174`	`public static class ReadTimeoutEmitsTest extends LoggerTest {`
`179`	`175`
`180`	`176`	`private Level logLevel;`
`@@ -231,7 +227,6 @@ public Retryer clone() {`
`231`	`227`	`}`
`232`	`228`	`}`
`233`	`229`
`234`		`- @Nested`
`235`	`230`	`public static class UnknownHostEmitsTest extends LoggerTest {`
`236`	`231`
`237`	`232`	`private Level logLevel;`
`@@ -283,7 +278,6 @@ public Retryer clone() {`
`283`	`278`	`}`
`284`	`279`	`}`
`285`	`280`
`286`		`- @Nested`
`287`	`281`	`public static class FormatCharacterTest extends LoggerTest {`
`288`	`282`
`289`	`283`	`private Level logLevel;`
`@@ -335,7 +329,6 @@ public Retryer clone() {`
`335`	`329`	`}`
`336`	`330`	`}`
`337`	`331`
`338`		`- @Nested`
`339`	`332`	`public static class RetryEmitsTest extends LoggerTest {`
`340`	`333`
`341`	`334`	`private Level logLevel;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2023 The Feign Authors`
	`2`	`+ * Copyright 2012-2024 The Feign Authors`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except`
`5`	`5`	`* in compliance with the License. You may obtain a copy of the License at`
`@@ -18,14 +18,12 @@`
`18`	`18`	`import java.lang.reflect.Type;`
`19`	`19`	`import java.util.List;`
`20`	`20`	`import java.util.concurrent.CompletableFuture;`
`21`		`-import org.junit.jupiter.api.Nested;`
`22`	`21`	`import org.junit.jupiter.api.Test;`
`23`	`22`
`24`	`23`
`25`	`24`
`26`	`25`	`public class MethodInfoTest {`
`27`	`26`
`28`		`- @Nested`
`29`	`27`	`static class AsyncClientTest {`
`30`	`28`	`public interface AsyncClient {`
`31`	`29`	`CompletableFuture<String> log();`
`@@ -39,7 +37,6 @@ void completableFutureOfString() throws Exception {`
`39`	`37`	`}`
`40`	`38`	`}`
`41`	`39`
`42`		`- @Nested`
`43`	`40`	`static class GenericAsyncClientTest {`
`44`	`41`	`public interface GenericAsyncClient<T> {`
`45`	`42`	`T log();`
`@@ -56,7 +53,6 @@ void genericCompletableFutureOfString() throws Exception {`
`56`	`53`	`}`
`57`	`54`	`}`
`58`	`55`
`59`		`- @Nested`
`60`	`56`	`static class SyncClientTest {`
`61`	`57`	`public interface SyncClient {`
`62`	`58`	`String log();`
`@@ -70,7 +66,6 @@ void string() throws Exception {`
`70`	`66`	`}`
`71`	`67`	`}`
`72`	`68`
`73`		`- @Nested`
`74`	`69`	`static class GenericSyncClientTest {`
`75`	`70`	`public interface GenericSyncClient<T> {`
`76`	`71`	`T log();`