Merge pull request #8405 from kwoyke/BAEL-19988

BAEL-19988: Migrate testing-modules module to the com.baeldung package

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java

@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java

@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.*;
 

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java

@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java

@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.util.StringJoiner;
 

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java

@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
 
 import java.time.LocalDate;
 import java.util.Objects;

testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java

@@ -1,6 +1,6 @@
-package org.baeldung.easy.random.randomizer;
+package com.baeldung.easy.random.randomizer;
 
-import org.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.model.YearQuarter;
 import org.jeasy.random.api.Randomizer;
 
 import java.time.LocalDate;

testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java

@@ -1,9 +1,9 @@
-package org.baeldung.easy.random;
+package com.baeldung.easy.random;
 
-import org.baeldung.easy.random.model.Employee;
+import com.baeldung.easy.random.model.Employee;
-import org.baeldung.easy.random.model.Person;
+import com.baeldung.easy.random.model.Person;
-import org.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.model.YearQuarter;
-import org.baeldung.easy.random.randomizer.YearQuarterRandomizer;
+import com.baeldung.easy.random.randomizer.YearQuarterRandomizer;
 import org.jeasy.random.EasyRandom;
 import org.jeasy.random.EasyRandomParameters;
 import org.jeasy.random.FieldPredicates;

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java

@@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SelectPackages;
 import org.junit.runner.RunWith;
 
 @RunWith(JUnitPlatform.class)
-@SelectPackages({ "org.baeldung.java.suite.childpackage1", "org.baeldung.java.suite.childpackage2" })
+@SelectPackages({ "com.baeldung.java.suite.childpackage1", "com.baeldung.java.suite.childpackage2" })
 public class SelectPackagesSuiteUnitTest {
 
 }

testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class AdvancedCollaborator {
     int i;

testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java

@@ -1,4 +1,4 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import java.util.Random;
 

testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Collaborator {
 

testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import java.util.List;
 

testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Model {
     public String getInfo() {

testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 public class Performer {
 	private Collaborator collaborator;

testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginController {
 

testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginDao {
 

testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class LoginService {
 

testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java

@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
 
 public class UserForm {
 

testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java

@@ -1,9 +1,9 @@
-package org.baeldung.mocks.easymock;
+package com.baeldung.easymock;
 
-import org.baeldung.mocks.testCase.LoginController;
+import com.baeldung.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
+import com.baeldung.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
+import com.baeldung.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.UserForm;
 import org.easymock.*;
 import org.junit.Assert;
 import org.junit.Test;

testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java

@@ -1,10 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.baeldung.jmockit.AdvancedCollaborator;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java

@@ -1,10 +1,9 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import mockit.Deencapsulation;
 import mockit.Mock;
 import mockit.MockUp;
 

testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java

@@ -1,5 +1,7 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.ExpectationsCollaborator;
+import com.baeldung.jmockit.Model;
 import mockit.Delegate;
 import mockit.Expectations;
 import mockit.Mocked;

testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java

@@ -1,11 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
 import mockit.*;
 import mockit.integration.junit4.JMockit;
-import org.baeldung.mocks.testCase.LoginController;
+import com.baeldung.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
+import com.baeldung.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
+import com.baeldung.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.UserForm;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.junit.Assert;

testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java

@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java

@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
 
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java

@@ -1,9 +1,9 @@
-package org.baeldung.mocks.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mocks.testCase.LoginController;
+import com.baeldung.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
+import com.baeldung.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
+import com.baeldung.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.UserForm;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java

@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
 
 public class GitHubUser {
 

testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java

@@ -1,11 +1,6 @@
 package com.baeldung.rest.jbehave;
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.baeldung.rest.GitHubUser;
-import org.baeldung.rest.RetrieveUtil;
 import org.hamcrest.Matchers;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.annotations.Then;

testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java

@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
 
 import java.io.IOException;
 

testing-modules/spring-testing/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-testing</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-testing</name>

testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java

@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java

@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java

@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 public class Employee {
     private Integer id;

testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java

@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java

@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
 
 import org.springframework.stereotype.Component;
 

testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java

@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java

@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
 
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java

@@ -1,11 +1,11 @@
-package org.baeldung.reflectiontestutils;
+package com.baeldung.reflectiontestutils;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
-import org.baeldung.reflectiontestutils.repository.Employee;
+import com.baeldung.reflectiontestutils.repository.EmployeeService;
-import org.baeldung.reflectiontestutils.repository.EmployeeService;
+import com.baeldung.reflectiontestutils.repository.HRService;
-import org.baeldung.reflectiontestutils.repository.HRService;
+import com.baeldung.reflectiontestutils.repository.Employee;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;