Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Java:packages
powermock
powermock-testng710.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File powermock-testng710.patch of Package powermock
From f08e39e6471e1eb5e33ae9ee55e67f8625d9a2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> Date: Tue, 23 Apr 2024 14:48:55 +0200 Subject: [PATCH 2/3] testng710 --- .../modules/testng/PowerMockObjectFactory.java | 12 ++++++------ .../powermock/modules/testng/PowerMockTestCase.java | 6 +++--- .../modules/testng/PowerMockObjectFactory.java | 8 ++++---- .../internal/PowerMockClassloaderObjectFactory.java | 4 ++-- .../java/samples/testng/agent/SampleServletTest.java | 4 ++-- .../test/java/samples/testng/SampleServletTest.java | 4 ++-- .../testng/staticmocking/MockitoMockStaticTest.java | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/powermock-modules/powermock-module-testng-agent/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java b/powermock-modules/powermock-module-testng-agent/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java index c3945db0..81100922 100644 --- a/powermock-modules/powermock-module-testng-agent/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java +++ b/powermock-modules/powermock-module-testng-agent/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java @@ -19,15 +19,15 @@ import org.powermock.core.agent.JavaAgentClassRegister; import org.powermock.modules.agent.PowerMockAgent; import org.powermock.modules.agent.support.JavaAgentClassRegisterImpl; import org.powermock.modules.agent.support.PowerMockAgentTestInitializer; -import org.testng.IObjectFactory; -import org.testng.internal.ObjectFactoryImpl; +import org.testng.ITestObjectFactory; +import org.testng.internal.objects.DefaultTestObjectFactory; import java.lang.reflect.Constructor; /** * The PowerMock object factory for PowerMock java agent. */ -public class PowerMockObjectFactory implements IObjectFactory { +public class PowerMockObjectFactory implements ITestObjectFactory { static { if (PowerMockObjectFactory.class.getClassLoader() != ClassLoader.getSystemClassLoader()) { @@ -36,10 +36,10 @@ public class PowerMockObjectFactory implements IObjectFactory { PowerMockAgent.initializeIfPossible(); } - private final ObjectFactoryImpl defaultObjectFactory; + private final DefaultTestObjectFactory defaultObjectFactory; public PowerMockObjectFactory() { - defaultObjectFactory = new ObjectFactoryImpl(); + defaultObjectFactory = new DefaultTestObjectFactory(); } @Override @@ -49,4 +49,4 @@ public class PowerMockObjectFactory implements IObjectFactory { PowerMockAgentTestInitializer.initialize(testClass, agentClassRegister); return defaultObjectFactory.newInstance(constructor, params); } -} \ No newline at end of file +} diff --git a/powermock-modules/powermock-module-testng-common/src/main/java/org/powermock/modules/testng/PowerMockTestCase.java b/powermock-modules/powermock-module-testng-common/src/main/java/org/powermock/modules/testng/PowerMockTestCase.java index 4ca2876c..3503428e 100644 --- a/powermock-modules/powermock-module-testng-common/src/main/java/org/powermock/modules/testng/PowerMockTestCase.java +++ b/powermock-modules/powermock-module-testng-common/src/main/java/org/powermock/modules/testng/PowerMockTestCase.java @@ -18,7 +18,7 @@ package org.powermock.modules.testng; import org.powermock.core.MockRepository; import org.powermock.core.classloader.MockClassLoader; import org.powermock.reflect.Whitebox; -import org.testng.IObjectFactory; +import org.testng.ITestObjectFactory; import org.testng.ITestContext; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; @@ -108,10 +108,10 @@ public class PowerMockTestCase { * @return The PowerMock object factory. */ @ObjectFactory - public IObjectFactory create(ITestContext context) { + public ITestObjectFactory create(ITestContext context) { try { final Class<?> powerMockObjectFactory = Class.forName("org.powermock.modules.testng.PowerMockObjectFactory"); - return (IObjectFactory) powerMockObjectFactory.newInstance(); + return (ITestObjectFactory) powerMockObjectFactory.newInstance(); } catch (ClassNotFoundException e) { throw new IllegalStateException("Missing org.powermock.modules.testng.PowerMockObjectFactory in classpath."); } catch (Exception e) { diff --git a/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java b/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java index b4876993..c7e9f720 100644 --- a/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java +++ b/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/PowerMockObjectFactory.java @@ -18,8 +18,8 @@ package org.powermock.modules.testng; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.testng.internal.PowerMockClassloaderObjectFactory; -import org.testng.IObjectFactory; -import org.testng.internal.ObjectFactoryImpl; +import org.testng.ITestObjectFactory; +import org.testng.internal.objects.DefaultTestObjectFactory; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -29,11 +29,11 @@ import java.lang.reflect.Method; * {@link PrepareForTest} or {@link SuppressStaticInitializationFor} the PowerMock classloader will enable the class * for PowerMock testing, otherwise a standard ObjectFactory is used. */ -public class PowerMockObjectFactory implements IObjectFactory { +public class PowerMockObjectFactory implements ITestObjectFactory { private PowerMockClassloaderObjectFactory powerMockObjectFactory = new PowerMockClassloaderObjectFactory(); - private ObjectFactoryImpl defaultObjectFactory = new ObjectFactoryImpl(); + private DefaultTestObjectFactory defaultObjectFactory = new DefaultTestObjectFactory(); @Override public Object newInstance(Constructor constructor, Object... params) { diff --git a/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/internal/PowerMockClassloaderObjectFactory.java b/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/internal/PowerMockClassloaderObjectFactory.java index c232762c..553f8131 100644 --- a/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/internal/PowerMockClassloaderObjectFactory.java +++ b/powermock-modules/powermock-module-testng/src/main/java/org/powermock/modules/testng/internal/PowerMockClassloaderObjectFactory.java @@ -17,11 +17,11 @@ package org.powermock.modules.testng.internal; import org.powermock.core.MockRepository; -import org.testng.IObjectFactory; +import org.testng.ITestObjectFactory; import java.lang.reflect.Constructor; -public class PowerMockClassloaderObjectFactory implements IObjectFactory { +public class PowerMockClassloaderObjectFactory implements ITestObjectFactory { private final TestNGMockClassLoaderFactory classLoaderFactory; diff --git a/tests/easymock/testng-agent/src/test/java/samples/testng/agent/SampleServletTest.java b/tests/easymock/testng-agent/src/test/java/samples/testng/agent/SampleServletTest.java index 9ba0a50f..0d46d6c8 100644 --- a/tests/easymock/testng-agent/src/test/java/samples/testng/agent/SampleServletTest.java +++ b/tests/easymock/testng-agent/src/test/java/samples/testng/agent/SampleServletTest.java @@ -18,7 +18,7 @@ package samples.testng.agent; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.testng.PowerMockObjectFactory; -import org.testng.IObjectFactory; +import org.testng.ITestObjectFactory; import org.testng.annotations.ObjectFactory; import org.testng.annotations.Test; import samples.servletmocking.SampleServlet; @@ -50,7 +50,7 @@ public class SampleServletTest { } @ObjectFactory - public IObjectFactory getObjectFactory() { + public ITestObjectFactory getObjectFactory() { return new PowerMockObjectFactory(); } } diff --git a/tests/easymock/testng/src/test/java/samples/testng/SampleServletTest.java b/tests/easymock/testng/src/test/java/samples/testng/SampleServletTest.java index e28bd3db..5716e21f 100644 --- a/tests/easymock/testng/src/test/java/samples/testng/SampleServletTest.java +++ b/tests/easymock/testng/src/test/java/samples/testng/SampleServletTest.java @@ -18,7 +18,7 @@ package samples.testng; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.testng.PowerMockObjectFactory; -import org.testng.IObjectFactory; +import org.testng.ITestObjectFactory; import org.testng.annotations.ObjectFactory; import org.testng.annotations.Test; import samples.servletmocking.SampleServlet; @@ -50,7 +50,7 @@ public class SampleServletTest { } @ObjectFactory - public IObjectFactory getObjectFactory() { + public ITestObjectFactory getObjectFactory() { return new PowerMockObjectFactory(); } } diff --git a/tests/mockito/testng/src/test/java/samples/powermockito/testng/staticmocking/MockitoMockStaticTest.java b/tests/mockito/testng/src/test/java/samples/powermockito/testng/staticmocking/MockitoMockStaticTest.java index c772ea4a..4c50c9fb 100644 --- a/tests/mockito/testng/src/test/java/samples/powermockito/testng/staticmocking/MockitoMockStaticTest.java +++ b/tests/mockito/testng/src/test/java/samples/powermockito/testng/staticmocking/MockitoMockStaticTest.java @@ -18,7 +18,7 @@ package samples.powermockito.testng.staticmocking; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.testng.PowerMockObjectFactory; import org.testng.Assert; -import org.testng.IObjectFactory; +import org.testng.ITestObjectFactory; import org.testng.annotations.ObjectFactory; import org.testng.annotations.Test; import samples.singleton.StaticHelper; @@ -37,7 +37,7 @@ import static org.powermock.api.mockito.PowerMockito.when; public class MockitoMockStaticTest { @ObjectFactory - public IObjectFactory getObjectFactory() { + public ITestObjectFactory getObjectFactory() { return new PowerMockObjectFactory(); } -- 2.44.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
