[cxf] 01/02: CXF-8890: Get rid of EasyMock in cxf-rt-transports-http (#1317)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9b166d741d55af9688f76cbca94f0cd6c835a9cb
Author: Andriy Redko
AuthorDate: Fri Jun 30 14:53:28 2023 -0400
CXF-8890: Get rid of EasyMock in cxf-rt-transports-http (#1317)
(cherry picked from commit 7aefb697f7b391170bb48faecf2638e6f72ab9b1)
---
rt/transports/http/pom.xml | 5 -
.../http/DestinationRegistryImplTest.java | 27 +--
.../transport/http/HTTPConduitURLEasyMockTest.java | 200 +++--
.../org/apache/cxf/transport/http/HeadersTest.java | 42 ++---
.../cxf/transport/http/policy/PolicyUtilsTest.java | 54 ++
.../cxf/transport/servlet/BaseUrlHelperTest.java | 22 +--
.../transport/servlet/ServletControllerTest.java | 117 ++--
7 files changed, 165 insertions(+), 302 deletions(-)
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 0c3c37345b..1cc5c3b019 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -68,11 +68,6 @@
junit
test
-
-org.easymock
-easymock
-test
-
org.mockito
mockito-core
diff --git
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 10e926784d..7a52c129df 100755
---
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -26,8 +26,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +34,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
*
@@ -52,20 +52,17 @@ public class DestinationRegistryImplTest {
private static final int[] MATCHED_PATH_INDEXES = {0, 0, 1, -1,
3, 0, 0, 4,
-1, 5, 5, 5};
-private IMocksControl control;
private DestinationRegistry registry;
private MessageObserver observer;
@Before
public void setUp() {
-control = EasyMock.createNiceControl();
registry = new DestinationRegistryImpl();
-observer = control.createMock(MessageObserver.class);
+observer = mock(MessageObserver.class);
}
@After
public void tearDown() {
-control = null;
registry = null;
}
@@ -93,20 +90,18 @@ public class DestinationRegistryImplTest {
for (int j = 0; j < REGISTERED_PATHS.length; j++) {
AbstractHTTPDestination target =
registry.getDestinationForPath(REGISTERED_PATHS[j]);
if (mi == j) {
-
EasyMock.expect(target.getMessageObserver()).andReturn(observer);
+when(target.getMessageObserver()).thenReturn(observer);
EndpointInfo endpoint = new EndpointInfo();
endpoint.setAddress(REGISTERED_PATHS[mi]);
endpoint.setName(QNAME);
-
EasyMock.expect(target.getEndpointInfo()).andReturn(endpoint);
+when(target.getEndpointInfo()).thenReturn(endpoint);
} else {
-
EasyMock.expect(target.getMessageObserver()).andReturn(observer).anyTimes();
+when(target.getMessageObserver()).thenReturn(observer);
}
}
-control.replay();
-
AbstractHTTPDestination destination =
registry.checkRestfulRequest(REQUEST_PATHS[i]);
if (0 <= mi) {
@@ -117,25 +112,19 @@ public class DestinationRegistryImplTest {
} else {
assertNull(destination);
}
-
-control.verify();
-
-control.reset();
}
}
private void setUpDestinations() {
for (int i = 0; i < REGISTERED_PATHS.length; i++) {
-AbstractHTTPDestination destination =
control.createMock(AbstractHTTPDestination.class);
+AbstractHTTPDestination destination =
mock(AbstractHTTPDestination.class);
EndpointInfo endpoint = new EndpointInfo();
endpoint.setAddress(REGISTERED_PATHS[i]);
endpoint.setName(QNAME);
-EasyMock.expe
[cxf] branch 3.6.x-fixes updated (a1532c92f1 -> 4ff95e740d)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from a1532c92f1 Recording .gitmergeinfo Changes new 9b166d741d CXF-8890: Get rid of EasyMock in cxf-rt-transports-http (#1317) new 4ff95e740d Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + rt/transports/http/pom.xml | 5 - .../http/DestinationRegistryImplTest.java | 27 +-- .../transport/http/HTTPConduitURLEasyMockTest.java | 200 +++-- .../org/apache/cxf/transport/http/HeadersTest.java | 42 ++--- .../cxf/transport/http/policy/PolicyUtilsTest.java | 54 ++ .../cxf/transport/servlet/BaseUrlHelperTest.java | 22 +-- .../transport/servlet/ServletControllerTest.java | 117 ++-- 8 files changed, 166 insertions(+), 302 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 4ff95e740d46ff0a04adcbbc6b36b89e5acb89d0 Author: Andriy Redko AuthorDate: Fri Jun 30 14:53:51 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 0b10eb4627..25fcd3835b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -382,6 +382,7 @@ M 7636d19f235706912276294ba404f6c64df048ca M 76e0fdb027da9f1756902f574de59b087a88da4d M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c M 79da13fc29d7c94da41b7f4510eaceeb725885ab +M 7aefb697f7b391170bb48faecf2638e6f72ab9b1 M 7c9a063fc4e300e9787e19f42b86a9b7fdeda82a M 7dc87bce5436a7aee3899c2bc67629cc56fc4623 M 7e317f44903968cba5a81ad6942372ac52332e79
[cxf] branch main updated (bd9a4180c2 -> 7aefb697f7)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from bd9a4180c2 Bump groovy from 3.0.17 to 3.0.18 (#1325) add 7aefb697f7 CXF-8890: Get rid of EasyMock in cxf-rt-transports-http (#1317) No new revisions were added by this update. Summary of changes: rt/transports/http/pom.xml | 5 - .../http/DestinationRegistryImplTest.java | 27 +-- .../transport/http/HTTPConduitURLEasyMockTest.java | 200 +++-- .../org/apache/cxf/transport/http/HeadersTest.java | 42 ++--- .../cxf/transport/http/policy/PolicyUtilsTest.java | 54 ++ .../cxf/transport/servlet/BaseUrlHelperTest.java | 22 +-- .../transport/servlet/ServletControllerTest.java | 117 ++-- 7 files changed, 165 insertions(+), 302 deletions(-)
[cxf] 02/03: Bump groovy from 3.0.17 to 3.0.18 (#1325)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit ce8826bbe5c06569e9f522e7c11f922ea6231e9c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jun 30 07:59:13 2023 -0400 Bump groovy from 3.0.17 to 3.0.18 (#1325) Bumps [groovy](https://github.com/apache/groovy) from 3.0.17 to 3.0.18. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit bd9a4180c2c83193b97b15db14483f139482a5b7) --- distribution/src/main/release/samples/groovy_spring_support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/release/samples/groovy_spring_support/pom.xml b/distribution/src/main/release/samples/groovy_spring_support/pom.xml index 6d2e4cdc38..b1dea0c42d 100644 --- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml +++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml @@ -111,7 +111,7 @@ org.codehaus.groovy groovy -3.0.17 +3.0.18 org.springframework
[cxf] 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a1532c92f199170bb1adafc0f09563236b0e1772 Author: Andriy Redko AuthorDate: Fri Jun 30 09:31:46 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 0ae7287a45..0b10eb4627 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -441,6 +441,7 @@ M 9c02fc36fdf5ea10cdffdb429da9a65e02a7b5ba M 9c3dc283369f6c829b040920cbb93002daf3d440 M 9c93695b123a1de0f93d85e04d31b6e6abd81130 M 9cb9eb0cfc3c6628793129c7660e0e6de557c963 +M 9e0d6ccd9f376e0c3d45ef04a6e834d5cd1da1ec M 9e9baea9cdfc6c1e9a09d851b571e7cfa62df209 M 9fdf22dfd1ed21a776d935754f1dd02aef67ce95 M a25da60afef8051cab6b8b0a733346dad718f65a
[cxf] branch 3.6.x-fixes updated (e2609796a3 -> a1532c92f1)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from e2609796a3 Recording .gitmergeinfo Changes new f54de185fc Bump jboss-logging from 3.5.1.Final to 3.5.2.Final (#1324) new ce8826bbe5 Bump groovy from 3.0.17 to 3.0.18 (#1325) new a1532c92f1 Recording .gitmergeinfo Changes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + distribution/src/main/release/samples/groovy_spring_support/pom.xml | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
[cxf] 01/03: Bump jboss-logging from 3.5.1.Final to 3.5.2.Final (#1324)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f54de185fcd6dfc69b1dd6609d0486ed06b68b19
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 30 07:58:54 2023 -0400
Bump jboss-logging from 3.5.1.Final to 3.5.2.Final (#1324)
Bumps [jboss-logging](https://github.com/jboss-logging/jboss-logging) from
3.5.1.Final to 3.5.2.Final.
- [Release notes](https://github.com/jboss-logging/jboss-logging/releases)
-
[Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.1.Final...3.5.2.Final)
---
updated-dependencies:
- dependency-name: org.jboss.logging:jboss-logging
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 9e0d6ccd9f376e0c3d45ef04a6e834d5cd1da1ec)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4edcaef222..aaeac2fde1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,7 @@
2.3.3
${cxf.jaxb.runtime.version}
2.0.0
-3.5.1.Final
+3.5.2.Final
3.1.7.SP1
1.1.1
1.0
[cxf] branch dependabot/maven/org.codehaus.groovy-groovy-3.0.18 deleted (was f06a52edf2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.groovy-groovy-3.0.18 in repository https://gitbox.apache.org/repos/asf/cxf.git was f06a52edf2 Bump groovy from 3.0.17 to 3.0.18 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch main updated (9e0d6ccd9f -> bd9a4180c2)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 9e0d6ccd9f Bump jboss-logging from 3.5.1.Final to 3.5.2.Final (#1324) add bd9a4180c2 Bump groovy from 3.0.17 to 3.0.18 (#1325) No new revisions were added by this update. Summary of changes: distribution/src/main/release/samples/groovy_spring_support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch dependabot/maven/org.jboss.logging-jboss-logging-3.5.2.Final deleted (was e9494de5fb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jboss.logging-jboss-logging-3.5.2.Final in repository https://gitbox.apache.org/repos/asf/cxf.git was e9494de5fb Bump jboss-logging from 3.5.1.Final to 3.5.2.Final The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch main updated (a0796fa149 -> 9e0d6ccd9f)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from a0796fa149 CXF-8861: Get rid of EasyMock in cxf-rt-ws-policy (#1315) add 9e0d6ccd9f Bump jboss-logging from 3.5.1.Final to 3.5.2.Final (#1324) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
