Skip to content

Commit 2af9eb8

Browse files
amit2103amit2103
committed
[BAEL-9017] - Fixed conflicts
1 parent 258532c commit 2af9eb8

File tree

12 files changed

+28
-28
lines changed

12 files changed

+28
-28
lines changed

‎animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppTest.java renamed to ‎animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppUnitTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
/**
88
* Unit test for simple App.
99
*/
10-
public class AppTest
10+
public class AppUnitTest
1111
extends TestCase
1212
{
1313
/**
1414
* Create the test case
1515
*
1616
* @param testName name of the test case
1717
*/
18-
public AppTest( String testName )
18+
public AppUnitTest( String testName )
1919
{
2020
super( testName );
2121
}
@@ -25,7 +25,7 @@ public AppTest( String testName )
2525
*/
2626
public static Test suite()
2727
{
28-
return new TestSuite( AppTest.class );
28+
return new TestSuite( AppUnitTest.class );
2929
}
3030

3131
/**

‎guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java renamed to ‎guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.stackify.models.User;
1919
import com.stackify.services.MyService;
2020

21-
public class MyServiceTest {
21+
public class MyServiceUnitTest {
2222

23-
private static final Logger logger = LogManager.getLogger(MyServiceTest.class);
23+
private static final Logger logger = LogManager.getLogger(MyServiceUnitTest.class);
2424

2525
@Test
2626
public void testService() {

‎guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java renamed to ‎guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import ch.qos.logback.classic.Level;
1111

12-
public class EmployeeServiceTest {
12+
public class EmployeeServiceUnitTest {
1313
private static final Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
1414

1515
private EmployeeService employeeService = new EmployeeService();

‎guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java renamed to ‎guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static io.restassured.RestAssured.*;
77
import static org.hamcrest.CoreMatchers.*;
88

9-
public class UserServiceTest {
9+
public class UserServiceLiveTest {
1010
@Test
1111
public void whenAddUser_thenGetUserOk() {
1212
RestAssured.baseURI = "http://localhost:8080/rest-server";

‎java-difference-date/src/test/java/com/baeldung/DateDiffTest.java renamed to ‎java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import static org.junit.Assert.assertEquals;
1616

17-
public class DateDiffTest {
17+
public class DateDiffUnitTest {
1818
@Test
1919
public void givenTwoDatesBeforeJava8_whenDifferentiating_thenWeGetSix() throws ParseException {
2020
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH);

‎pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1081,8 +1081,8 @@
10811081
<!-- <module>libraries</module> <module>jmeter</module> -->
10821082
<!--<module>java-dates</module> --> <!-- Commented because we have still not upgraded to java 9 -->
10831083
<module>java-websocket</module>
1084-
<!-- <module>activejdbc</module> --><!-- PMD voilation -->
1085-
<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
1084+
<module>activejdbc</module>
1085+
<module>animal-sniffer-mvn-plugin</module>
10861086
<!-- <module>apache-avro</module> --><!-- Malformed POM -->
10871087
<module>apache-bval</module>
10881088
<module>apache-shiro</module>
@@ -1098,21 +1098,21 @@
10981098
<module>dubbo</module>
10991099
<!-- <module>flyway</module> --><!-- Malformed POM -->
11001100
<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
1101-
<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
1101+
<module>java-difference-date</module>
11021102
<!-- <module>JGit</module> --><!-- Unit test failure -->
11031103
<module>jni</module>
11041104
<module>jooby</module>
11051105
<!-- <module>micronaut</module> --><!-- Not upgraded to java 9 -->
11061106
<!-- <module>microprofile</module> --><!-- Takes too much time : Downloads 93 MBs zip and .. -->
11071107
<!-- <module>muleesb</module> --><!-- load main class org.mule.munit.remote.RemoteRunner -->
11081108
<module>ratpack</module>
1109-
<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
1109+
<module>rest-with-spark-java</module>
11101110
<module>spring-boot-autoconfiguration</module>
11111111
<module>spring-boot-custom-starter</module>
1112-
<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
1112+
<module>spring-boot-jasypt</module>
11131113
<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
11141114
<module>spring-data-rest-querydsl</module>
1115-
<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
1115+
<module>spring-groovy</module>
11161116
<module>spring-mobile</module>
11171117
<module>spring-mustache</module>
11181118
<module>spring-mvc-simple</module>
@@ -1123,7 +1123,7 @@
11231123
<module>spring-roo</module>
11241124
<module>spring-security-stormpath</module>
11251125
<module>sse-jaxrs</module>
1126-
<!-- <module>static-analysis</module> --><!-- PMD voilation -->
1126+
<module>static-analysis</module>
11271127
<module>stripe</module>
11281128
<!-- <module>structurizr</module> --><!-- Artiifact not found -->
11291129
<!-- <module>Twitter4J</module> --><!-- Test failure -->
@@ -1134,8 +1134,8 @@
11341134
<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
11351135
<!-- <module>guest/deep-jsf</module> --><!-- guest post on different site -->
11361136
<!-- <module>guest/junit5-example</module> --><!-- guest post on different site - Compilation failure -->
1137-
<!-- <module>guest/log4j2-example</module> --><!-- PMD voilation -->
1138-
<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
1137+
<!-- <module>guest/log4j2-example</module> --><!-- guest post on different site -->
1138+
<!-- <module>guest/logback-example</module> --><!-- guest post on different site -->
11391139
<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
11401140
<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
11411141
<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
@@ -1151,7 +1151,7 @@
11511151
<module>spring-boot-h2/spring-boot-h2-database</module>
11521152
<!--module>spring-boot-h2/spring-boot-h2-remote-app</module-->
11531153
<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
1154-
<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
1154+
<!-- <module>guest\webservices\rest-server</module> --><!-- guest post on different site -->
11551155
<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
11561156
</modules>
11571157

‎rest-with-spark-java/src/test/java/com/baeldung/AppTest.java renamed to ‎rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
import junit.framework.TestCase;
1717
import junit.framework.TestSuite;
1818

19-
public class AppTest extends TestCase {
19+
public class AppLiveTest extends TestCase {
2020

2121
ObjectMapper mapper = new ObjectMapper();
2222

23-
public AppTest( String testName ) {
23+
public AppLiveTest( String testName ) {
2424
super( testName );
2525
}
2626

2727
public static Test suite() {
28-
return new TestSuite( AppTest.class );
28+
return new TestSuite( AppLiveTest.class );
2929
}
3030

3131
public void testApp() throws IOException, ClassNotFoundException {

‎spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java renamed to ‎spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.Test;
88
import org.springframework.context.support.GenericGroovyApplicationContext;
99

10-
public class GroovyConfigurationTest {
10+
public class GroovyConfigurationUnitTest {
1111

1212
private static final String FILE_NAME = "GroovyBeanConfig.groovy";
1313
private static final String FILE_PATH = "src/main/java/com/baeldug/groovyconfig/";

‎spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java renamed to ‎spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Test;
66
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
77

8-
public class JavaConfigurationTest {
8+
public class JavaConfigurationUnitTest {
99

1010
@Test
1111
public void whenJavaConfig_thenCorrectPerson() {

‎spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java renamed to ‎spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.context.ApplicationContext;
77
import org.springframework.context.support.ClassPathXmlApplicationContext;
88

9-
public class XmlConfigurationTest {
9+
public class XmlConfigurationUnitTest {
1010

1111
@Test
1212
public void whenXmlConfig_thenCorrectPerson() {

‎spring-groovy/src/test/java/com/baeldug/spring_groovy/AppTest.java renamed to ‎spring-groovy/src/test/java/com/baeldug/spring_groovy/AppUnitTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
/**
88
* Unit test for simple App.
99
*/
10-
public class AppTest
10+
public class AppUnitTest
1111
extends TestCase
1212
{
1313
/**
1414
* Create the test case
1515
*
1616
* @param testName name of the test case
1717
*/
18-
public AppTest( String testName )
18+
public AppUnitTest( String testName )
1919
{
2020
super( testName );
2121
}
@@ -25,7 +25,7 @@ public AppTest( String testName )
2525
*/
2626
public static Test suite()
2727
{
28-
return new TestSuite( AppTest.class );
28+
return new TestSuite( AppUnitTest.class );
2929
}
3030

3131
/**

‎static-analysis/src/test/java/com/baeldung/pmd/CntTest.java renamed to ‎static-analysis/src/test/java/com/baeldung/pmd/CntUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import org.junit.Test;
66

7-
public class CntTest {
7+
public class CntUnitTest {
88

99
private Cnt service;
1010

0 commit comments

Comments
 (0)