Description: Fix compatibility with EasyMock version in Debian.
 - EasyMock.controlFor() replaced with MockControl.createControl()
 - testControl.activate() replaced with testControl.replay()
Forwarded: no
Author: Damien Raude-Morvan <drazzib@debian.org>
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
@@ -76,7 +76,7 @@
         super.setUp();
         
         // set ourself up
-        this.testControl = EasyMock.controlFor( Test.class );
+        this.testControl = MockControl.createControl( Test.class );
         this.mockTest = (Test)this.testControl.getMock();
     }
 
@@ -121,7 +121,7 @@
     
     public void testAddFailure3()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         createListener().addFailure( this.mockTest,
             new AssertionFailedError( "ignore error") );
@@ -166,7 +166,7 @@
     
     public void testAddError3()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         createListener().addError( this.mockTest,
             new Throwable( "ignore error") );
--- a/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java
+++ b/testing-autodoc/sources/ut/net/sourceforge/groboutils/autodoc/v1/AutoDocJDK13UTest.java
@@ -82,16 +82,16 @@
         super.setUp();
         
         // set ourself up
-        this.factoryControl = EasyMock.controlFor( AutoDocFactory.class );
+        this.factoryControl = MockControl.createControl( AutoDocFactory.class );
         this.mockFactory = (AutoDocFactory)this.factoryControl.getMock();
         
-        this.logControl = EasyMock.controlFor( AutoDocLog.class );
+        this.logControl = MockControl.createControl( AutoDocLog.class );
         this.mockLog = (AutoDocLog)this.logControl.getMock();
         
-        this.itControl = EasyMock.controlFor( AutoDocIT.class );
+        this.itControl = MockControl.createControl( AutoDocIT.class );
         this.mockIT = (AutoDocIT)this.itControl.getMock();
         
-        this.tpControl = EasyMock.controlFor( AutoDocTP.class );
+        this.tpControl = MockControl.createControl( AutoDocTP.class );
         this.mockTP = (AutoDocTP)this.tpControl.getMock();
     }
 
@@ -131,10 +131,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
@@ -75,7 +75,7 @@
         super.setUp();
         
         // set ourself up
-        this.testControl = EasyMock.controlFor( Test.class );
+        this.testControl = MockControl.createControl( Test.class );
         this.mockTest = (Test)this.testControl.getMock();
     }
 
--- 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
@@ -78,7 +78,7 @@
         super.setUp();
         
         // set ourself up
-        this.testControl = EasyMock.controlFor( Test.class );
+        this.testControl = MockControl.createControl( Test.class );
         this.mockTest = (Test)this.testControl.getMock();
     }
 
@@ -105,7 +105,7 @@
     
     public void testAddFailure3()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         // failures can occur without a startTest being called!
         createListener().addFailure( this.mockTest,
@@ -117,7 +117,7 @@
     
     public void testAddFailure4()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         AutoDocJUnitListener adjul = createListener();
         adjul.startTest( this.mockTest );
@@ -148,7 +148,7 @@
     
     public void testAddError3()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         // errors can occur without a startTest being called!
         createListener().addError( this.mockTest,
@@ -160,7 +160,7 @@
     
     public void testAddError4()
     {
-        this.testControl.activate();
+        this.testControl.replay();
         
         AutoDocJUnitListener adjul = createListener();
         adjul.startTest( this.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
@@ -79,13 +79,13 @@
         super.setUp();
         
         // set ourself up
-        this.logControl = EasyMock.controlFor( AutoDocLog.class );
+        this.logControl = MockControl.createControl( AutoDocLog.class );
         this.mockLog = (AutoDocLog)this.logControl.getMock();
         
-        this.itControl = EasyMock.controlFor( AutoDocIT.class );
+        this.itControl = MockControl.createControl( AutoDocIT.class );
         this.mockIT = (AutoDocIT)this.itControl.getMock();
         
-        this.tpControl = EasyMock.controlFor( AutoDocTP.class );
+        this.tpControl = MockControl.createControl( AutoDocTP.class );
         this.mockTP = (AutoDocTP)this.tpControl.getMock();
     }
 
--- 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
@@ -77,7 +77,7 @@
         super.setUp();
         
         // set ourself up
-        this.scriptmakerControl = EasyMock.controlFor( IScriptMaker.class );
+        this.scriptmakerControl = MockControl.createControl( IScriptMaker.class );
         this.mockScriptmaker = (IScriptMaker)this.scriptmakerControl.getMock();
     }
     
@@ -99,7 +99,7 @@
         //this.mockScriptmaker.removeText("Text");
         //this.scriptmakerControl.setVoidCallable();
         
-        this.scriptmakerControl.activate();
+        this.scriptmakerControl.replay();
         ScriptGenerator sg = new ScriptGenerator( null, null,
             this.mockScriptmaker, "base" );
         MouseWheelCaptureEvent mwce = new MouseWheelCaptureEvent( 10 );