Description: Fix compatibility with EasyMock version in Debian. - EasyMock.controlFor() replaced with MockControl.createControl() - testControl.activate() replaced with EasyMock.replay(mock) Forwarded: no Author: Damien Raude-Morvan Last-Update: 2009-10-21 --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerJDK13UTest.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.testserver.junit.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -63,7 +62,6 @@ //------------------------------------------------------------------------- // setup - private MockControl testControl; private Test mockTest; @@ -76,8 +74,7 @@ super.setUp(); // set ourself up - this.testControl = EasyMock.controlFor( Test.class ); - this.mockTest = (Test)this.testControl.getMock(); + this.mockTest = (Test) EasyMock.createMock(Test.class); } @@ -121,12 +118,12 @@ public void testAddFailure3() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); createListener().addFailure( this.mockTest, new AssertionFailedError( "ignore error") ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } @@ -166,12 +163,12 @@ public void testAddError3() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); createListener().addError( this.mockTest, new Throwable( "ignore error") ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -60,16 +59,12 @@ //------------------------------------------------------------------------- // setup - private MockControl factoryControl; private AutoDocFactory mockFactory; - private MockControl logControl; private AutoDocLog mockLog; - private MockControl itControl; private AutoDocIT mockIT; - private MockControl tpControl; private AutoDocTP mockTP; @@ -82,17 +77,13 @@ super.setUp(); // set ourself up - this.factoryControl = EasyMock.controlFor( AutoDocFactory.class ); - this.mockFactory = (AutoDocFactory)this.factoryControl.getMock(); + this.mockFactory = (AutoDocFactory) EasyMock.createMock(AutoDocFactory.class); - this.logControl = EasyMock.controlFor( AutoDocLog.class ); - this.mockLog = (AutoDocLog)this.logControl.getMock(); + this.mockLog = (AutoDocLog) EasyMock.createMock(AutoDocLog.class); - this.itControl = EasyMock.controlFor( AutoDocIT.class ); - this.mockIT = (AutoDocIT)this.itControl.getMock(); + this.mockIT = (AutoDocIT) EasyMock.createMock(AutoDocIT.class); - this.tpControl = EasyMock.controlFor( AutoDocTP.class ); - this.mockTP = (AutoDocTP)this.tpControl.getMock(); + this.mockTP = (AutoDocTP) EasyMock.createMock(AutoDocTP.class); } @@ -131,10 +122,10 @@ this.mockFactory.createTP( this.getClass() ); this.factoryControl.setReturnValue( this.mockTP, 1 ); - this.factoryControl.activate(); - this.logControl.activate(); - this.itControl.activate(); - this.tpControl.activate(); + this.factoryControl.replay(); + this.logControl.replay(); + this.itControl.replay(); + this.tpControl.replay(); MockAutoDoc mad = new MockAutoDoc( this.getClass(), this.mockFactory ); --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerJDK13UTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.autodoc.v1.junit; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -62,7 +61,6 @@ //------------------------------------------------------------------------- // setup - private MockControl testControl; private Test mockTest; @@ -75,8 +73,7 @@ super.setUp(); // set ourself up - this.testControl = EasyMock.controlFor( Test.class ); - this.mockTest = (Test)this.testControl.getMock(); + this.mockTest = (Test) EasyMock.createMock(Test.class); } --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitListenerUTestI.java @@ -29,7 +29,6 @@ import java.util.Enumeration; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -65,7 +64,6 @@ //------------------------------------------------------------------------- // setup - private MockControl testControl; private Test mockTest; @@ -78,8 +76,7 @@ super.setUp(); // set ourself up - this.testControl = EasyMock.controlFor( Test.class ); - this.mockTest = (Test)this.testControl.getMock(); + this.mockTest = (Test) EasyMock.createMock(Test.class); } @@ -105,19 +102,19 @@ public void testAddFailure3() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); // failures can occur without a startTest being called! createListener().addFailure( this.mockTest, new AssertionFailedError( "ignore error") ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } public void testAddFailure4() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); AutoDocJUnitListener adjul = createListener(); adjul.startTest( this.mockTest ); @@ -125,7 +122,7 @@ new AssertionFailedError( "ignore error") ); adjul.endTest( this.mockTest ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } @@ -148,19 +145,19 @@ public void testAddError3() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); // errors can occur without a startTest being called! createListener().addError( this.mockTest, new Throwable( "ignore error") ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } public void testAddError4() { - this.testControl.activate(); + EasyMock.replay(new Object[] {mockTest}); AutoDocJUnitListener adjul = createListener(); adjul.startTest( this.mockTest ); @@ -168,7 +165,7 @@ new Throwable( "ignore error") ); adjul.endTest( this.mockTest ); - this.testControl.verify(); + EasyMock.verify(new Object[] {mockTest}); } --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestInfoJDK13UTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.testserver.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; @@ -60,13 +59,10 @@ //------------------------------------------------------------------------- // setup - private MockControl logControl; private AutoDocLog mockLog; - private MockControl itControl; private AutoDocIT mockIT; - private MockControl tpControl; private AutoDocTP mockTP; @@ -79,14 +75,11 @@ super.setUp(); // set ourself up - this.logControl = EasyMock.controlFor( AutoDocLog.class ); - this.mockLog = (AutoDocLog)this.logControl.getMock(); + this.mockLog = (AutoDocLog) EasyMock.createMock(AutoDocLog.class); - this.itControl = EasyMock.controlFor( AutoDocIT.class ); - this.mockIT = (AutoDocIT)this.itControl.getMock(); + this.mockIT = (AutoDocIT) EasyMock.createMock(AutoDocIT.class); - this.tpControl = EasyMock.controlFor( AutoDocTP.class ); - this.mockTP = (AutoDocTP)this.tpControl.getMock(); + this.mockTP = (AutoDocTP) EasyMock.createMock(AutoDocTP.class); } --- a/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java +++ b/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorImplJDK13UTest.java @@ -70,7 +70,7 @@ super.setUp(); // set ourself up - this.phControl = EasyMock.controlFor( IPathHistory.class ); + this.phControl = MockControl.createControl( IPathHistory.class ); this.mockPH = (IPathHistory)this.phControl.getMock(); } @@ -99,7 +99,7 @@ { String msg = "blah"; Throwable t = new Throwable(); - this.phControl.activate(); + this.phControl.replay(); ErrorImpl ei = new ErrorImpl( msg, t, this.mockPH ); --- a/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java +++ b/testing-mbtf/sources/ut/net/sourceforge/groboutils/mbtf/v1/engine/ErrorsImplJDK13UTest.java @@ -71,7 +71,7 @@ super.setUp(); // set ourself up - this.phControl = EasyMock.controlFor( IPathHistory.class ); + this.phControl = MockControl.createControl( IPathHistory.class ); this.mockPH = (IPathHistory)this.phControl.getMock(); } @@ -131,7 +131,7 @@ ErrorsImpl ei = new ErrorsImpl(); this.mockPH.copy(); this.phControl.setReturnValue( this.mockPH, 1 ); - this.phControl.activate(); + this.phControl.replay(); ei.setCurrentPathHistory( this.mockPH ); @@ -179,7 +179,7 @@ ErrorsImpl ei = new ErrorsImpl(); this.mockPH.copy(); this.phControl.setReturnValue( this.mockPH, 1 ); - this.phControl.activate(); + this.phControl.replay(); ei.setCurrentPathHistory( this.mockPH ); @@ -222,7 +222,7 @@ ErrorsImpl ei = new ErrorsImpl(); this.mockPH.copy(); this.phControl.setReturnValue( this.mockPH, 1 ); - this.phControl.activate(); + this.phControl.replay(); ei.setCurrentPathHistory( this.mockPH ); @@ -265,7 +265,7 @@ ErrorsImpl ei = new ErrorsImpl(); this.mockPH.copy(); this.phControl.setReturnValue( this.mockPH, 1 ); - this.phControl.activate(); + this.phControl.replay(); ei.setCurrentPathHistory( this.mockPH ); @@ -308,7 +308,7 @@ ErrorsImpl ei = new ErrorsImpl(); this.mockPH.copy(); this.phControl.setReturnValue( this.mockPH, 1 ); - this.phControl.activate(); + this.phControl.replay(); ei.setCurrentPathHistory( this.mockPH ); --- a/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java +++ b/uicapture/sources/ut/net/sourceforge/groboutils/uicapture/v1/ScriptGeneratorUTest.java @@ -39,7 +39,6 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.easymock.EasyMock; -import org.easymock.MockControl; /** @@ -63,7 +62,6 @@ } - private MockControl scriptmakerControl; private IScriptMaker mockScriptmaker; @@ -77,8 +75,7 @@ super.setUp(); // set ourself up - this.scriptmakerControl = EasyMock.controlFor( IScriptMaker.class ); - this.mockScriptmaker = (IScriptMaker)this.scriptmakerControl.getMock(); + this.mockScriptmaker = (IScriptMaker) EasyMock.createMock(IScriptMaker.class); } @@ -99,7 +96,7 @@ //this.mockScriptmaker.removeText("Text"); //this.scriptmakerControl.setVoidCallable(); - this.scriptmakerControl.activate(); + EasyMock.replay(new Object[] {mockScriptmaker}); ScriptGenerator sg = new ScriptGenerator( null, null, this.mockScriptmaker, "base" ); MouseWheelCaptureEvent mwce = new MouseWheelCaptureEvent( 10 ); @@ -108,7 +105,7 @@ sg.mouseWheelMoved( mwce ); - this.scriptmakerControl.verify(); + EasyMock.verify(new Object[] {mockScriptmaker}); } --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/parser/ITestCreatorUTestI.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/parser/ITestCreatorUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.junit.v1.iftc.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/parser/DelegateTestCreatorUTest.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/parser/DelegateTestCreatorUTest.java @@ -30,7 +30,6 @@ import java.lang.reflect.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/InterfaceTestSuiteUTest.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/InterfaceTestSuiteUTest.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/ImplFactoryUTestI.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/ImplFactoryUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/InterfaceTestCaseUTest.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/InterfaceTestCaseUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.junit.v1.iftc; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/CxFactorySample.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/CxFactorySample.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/CxFactoryUTest.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/CxFactoryUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.junit.v1.iftc; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/ICxFactoryUTestI.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/iftc/ICxFactoryUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/AssertConstructorUTest.java +++ b/testing-junit/sources/ut/net/sourceforge/groboutils/junit/v1/AssertConstructorUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.junit.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/ChainableExceptionHelperUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/ChainableExceptionHelperUTest.java @@ -31,7 +31,6 @@ import java.io.StringWriter; import java.io.ByteArrayOutputStream; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/IChainableExceptionUTestI.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/IChainableExceptionUTestI.java @@ -31,7 +31,6 @@ import java.io.StringWriter; import java.io.ByteArrayOutputStream; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/StackTraceLineParserUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/StackTraceLineParserUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.util.throwable.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/ThrowableParserUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/throwable/v1/ThrowableParserUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.util.throwable.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/ClassLoadHelperUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/ClassLoadHelperUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.util.classes.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/SPILoaderUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/SPILoaderUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.util.classes.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/SingletonStoreUTest.java +++ b/util-classes/sources/ut/net/sourceforge/groboutils/util/classes/v1/SingletonStoreUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.util.classes.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocITUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocITUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/DefaultMonitorUTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/DefaultMonitorUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.autodoc.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocFactoryUTestI.java @@ -31,7 +31,6 @@ import java.util.Enumeration; //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestListenerUTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestListenerUTest.java @@ -32,7 +32,6 @@ import java.util.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestListenerUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/junit/JUnitTestListenerUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.testserver.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestDataFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestDataFactoryUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestDataUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestDataUTestI.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.autodoc.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestInfoUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestInfoUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/MonitorFinderUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/MonitorFinderUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/MonitorUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/MonitorUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/ServerUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/ServerUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestCorrelateUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/TestCorrelateUTestI.java @@ -30,7 +30,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocLogFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocLogFactoryUTestI.java @@ -32,7 +32,6 @@ import java.util.Enumeration; //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocTPFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocTPFactoryUTestI.java @@ -32,7 +32,6 @@ import java.util.Enumeration; //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/TestListenerFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/TestListenerFactoryUTestI.java @@ -28,7 +28,6 @@ import java.util.Enumeration; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/AbstractWriterServerUTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/AbstractWriterServerUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.autodoc.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/AbstractWriterServerUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/testserver/AbstractWriterServerUTestI.java @@ -33,7 +33,6 @@ import java.io.IOException; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocLogUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocLogUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocTPUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocTPUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/AutoDocITSetUTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/AutoDocITSetUTest.java @@ -31,7 +31,6 @@ import net.sourceforge.groboutils.autodoc.v1.spi.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/DefaultAutoDocFactoryUTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/DefaultAutoDocFactoryUTest.java @@ -31,7 +31,6 @@ import net.sourceforge.groboutils.autodoc.v1.spi.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/IAutoDocSetUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/defimpl/IAutoDocSetUTestI.java @@ -28,7 +28,6 @@ //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitFormatterJDK13UTest.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/junit/AutoDocJUnitFormatterJDK13UTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.autodoc.v1.junit; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocITFactoryUTestI.java +++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/spi/AutoDocITFactoryUTestI.java @@ -32,7 +32,6 @@ import java.util.Enumeration; //import net.sourceforge.groboutils.testing.junitlog.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestRecordUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestRecordUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/ImmutableTestRecordUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/ImmutableTestRecordUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/IssueTestIssueRecordCollatorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/IssueTestIssueRecordCollatorUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/NameTestIssueRecordCollatorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/NameTestIssueRecordCollatorUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/SuiteTestIssueRecordCollatorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/SuiteTestIssueRecordCollatorUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/XMLTestIssueRecordWriterUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/XMLTestIssueRecordWriterUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/AbstractParserUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/AbstractParserUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/DefaultParserCollatorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/DefaultParserCollatorUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserCollatorUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserCollatorUTestI.java @@ -31,7 +31,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserGeneratorUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserGeneratorUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/parser/IParserUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordWriterUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordWriterUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestRecordUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestRecordUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/AbstractTestIssueRecordCollatorUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/AbstractTestIssueRecordCollatorUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/AllTestIssueRecordCollatorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/AllTestIssueRecordCollatorUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultIssueRecordUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultIssueRecordUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestIssueRecordSetUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestIssueRecordSetUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestIssueRecordUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/impl/DefaultTestIssueRecordUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeInfoUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeInfoUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeSetUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeSetUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IAttributeUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableAttributeSetUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableAttributeSetUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableAttributeUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableIssueStateUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableIssueStateUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableIssueUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableIssueUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableListAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IEditableListAttributeUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueStateUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueStateUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueTypeInfoUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueTypeInfoUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IListAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IListAttributeUTestI.java @@ -29,7 +29,6 @@ import java.util.Enumeration; import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IProblemManagerInfoUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IProblemManagerInfoUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IProblemManagerUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IProblemManagerUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/AutoDocITFactoryImplUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/AutoDocITFactoryImplUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/DefaultITFFactoryUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/DefaultITFFactoryUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/DefaultTestDataFactoryUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/DefaultTestDataFactoryUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFFactoryUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFFactoryUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import net.sourceforge.groboutils.junit.v1.*; import junit.framework.Test; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerFactoryUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFJUnitListenerFactoryUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFMonitorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFMonitorUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFTestDataUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/ITFTestDataUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.pmti.v1.autodoc.v1; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/AbstractAppendFileServerUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/AbstractAppendFileServerUTestI.java @@ -32,7 +32,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/AbstractNewFileServerUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/AbstractNewFileServerUTestI.java @@ -33,7 +33,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/LogFileServerUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/server/LogFileServerUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.testserver.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileParserGeneratorUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileParserGeneratorUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.parser.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileParserUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileParserUTest.java @@ -30,7 +30,6 @@ import java.io.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileServerUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/autodoc/v1/xml/XMLFileServerUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.autodoc.v1.server.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableAttributeUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableIssueUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableIssueUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableListAttributeUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractEditableListAttributeUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractIssueUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/AbstractIssueUTestI.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeInfoUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeInfoUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeSetUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeSetUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultAttributeUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultEditableAttributeSetUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultEditableAttributeSetUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultEditableIssueStateUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultEditableIssueStateUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultIssueStateUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultIssueStateUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultIssueTypeInfoUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultIssueTypeInfoUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultListAttributeUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultListAttributeUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultProblemManagerInfoUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/defimpl/DefaultProblemManagerInfoUTest.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/IIssueRecordUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/IIssueRecordUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITFReadProblemManagerUTest.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITFReadProblemManagerUTest.java @@ -30,7 +30,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.parser.*; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordCollatorUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordCollatorUTestI.java @@ -29,7 +29,6 @@ import net.sourceforge.groboutils.pmti.v1.itf.impl.*; import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordSetUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordSetUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/itf/ITestIssueRecordUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueUTestI.java +++ b/pmti/sources/ut/net/sourceforge/groboutils/pmti/v1/IIssueUTestI.java @@ -28,7 +28,6 @@ import net.sourceforge.groboutils.autodoc.v1.AutoDoc; import org.easymock.EasyMock; -import org.easymock.MockControl; import net.sourceforge.groboutils.junit.v1.iftc.*; import junit.framework.Test; import junit.framework.TestCase; --- a/testing-tp/sources/ut/net/sourceforge/groboutils/tp/v1/log/LogTPFactoryUTest.java +++ b/testing-tp/sources/ut/net/sourceforge/groboutils/tp/v1/log/LogTPFactoryUTest.java @@ -27,7 +27,6 @@ package net.sourceforge.groboutils.tp.v1.log; import org.easymock.EasyMock; -import org.easymock.MockControl; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite;