iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Sjmillington
2019-11-26 17:08:28 +00:00
parent 8e4cffdddc b305d9b362
commit 6cd72e4f78
219 changed files with 765 additions and 3508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-resttemplate/src/main/java/com/baeldung/SpringContextIntegrationTest.java
-20
View File
@@ -1,20 +0,0 @@
package com.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.produceimage.ImageApplication;
import com.baeldung.responseheaders.ResponseHeadersApplication;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { ImageApplication.class,
ResponseHeadersApplication.class, com.baeldung.web.upload.app.UploadApplication.class,
})
public class SpringContextIntegrationTest {
@Test
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
}
}
spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java
-16
View File
@@ -1,16 +0,0 @@
package org.baeldung;
import org.baeldung.resttemplate.RestTemplateConfigurationApplication;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = RestTemplateConfigurationApplication.class)
public class SpringContextIntegrationTest {
@Test
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
}
}