root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Phillip Webb 2024-09-24 13:51:53 -07:00
parent e210444c68 54c3ccb4df
commit de2e5eeb22
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/build.gradle
View File

@ -1,5 +1,6 @@
plugins { plugins {
id "java" id "java"
id "org.springframework.boot.conventions"
} }
description = "Spring Boot TestNG smoke test" description = "Spring Boot TestNG smoke test"

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java
View File

@ -16,15 +16,15 @@
package smoketest.testng; package smoketest.testng;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
@SpringBootApplication @SpringBootApplication
public class SampleTestNGApplication { public class SampleTestNGApplication {

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java
View File

@ -16,13 +16,13 @@
package smoketest.testng.web; package smoketest.testng.web;
import smoketest.testng.service.HelloWorldService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import smoketest.testng.service.HelloWorldService;
@Controller @Controller
public class SampleController { public class SampleController {

5
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java
View File

@ -16,7 +16,7 @@
package smoketest.testng; package smoketest.testng;
import static org.assertj.core.api.Assertions.assertThat; import org.testng.annotations.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@ -25,7 +25,8 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Basic integration tests for demo application. * Basic integration tests for demo application.