[Jguiraffe-developers] SF.net SVN: jguiraffe:[203] trunk/core
Brought to you by:
oheger
Menu
▾
▴
[Jguiraffe-developers] SF.net SVN: jguiraffe:[203] trunk/core
|
From: <oh...@us...> - 2011-07-27 19:39:04
|
Revision: 203
http://jguiraffe.svn.sourceforge.net/jguiraffe/?rev=203&view=rev
Author: oheger
Date: 2011-07-27 19:38:57 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
[3380231] Switched to EasyMock 3.0.
Modified Paths:
--------------
trunk/core/pom.xml
trunk/core/src/changes/changes.xml
trunk/core/src/test/java/net/sf/jguiraffe/di/impl/TestDefaultBeanContext.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/forms/TestComponentStoreImpl.java
trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/TestSwingTableModel.java
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2011-07-16 20:22:27 UTC (rev 202)
+++ trunk/core/pom.xml 2011-07-27 19:38:57 UTC (rev 203)
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.3</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
Modified: trunk/core/src/changes/changes.xml
===================================================================
--- trunk/core/src/changes/changes.xml 2011-07-16 20:22:27 UTC (rev 202)
+++ trunk/core/src/changes/changes.xml 2011-07-27 19:38:57 UTC (rev 203)
@@ -27,7 +27,10 @@
</properties>
<body>
<release version="1.1" date="in SVN" description="TBD">
- <action dev="oheger" issue="3368763" type="fix">
+ <action dev="oheger" issue="3380231" type="update">
+ Updated test dependency to EasyMock to the most recent version 3.0.
+ </action>
+ <action dev="oheger" issue="3368763" type="add">
Added a transformer to StaticTextData objects which simpliefies usage
of static text controls in forms.
</action>
Modified: trunk/core/src/test/java/net/sf/jguiraffe/di/impl/TestDefaultBeanContext.java
===================================================================
--- trunk/core/src/test/java/net/sf/jguiraffe/di/impl/TestDefaultBeanContext.java 2011-07-16 20:22:27 UTC (rev 202)
+++ trunk/core/src/test/java/net/sf/jguiraffe/di/impl/TestDefaultBeanContext.java 2011-07-27 19:38:57 UTC (rev 203)
@@ -174,9 +174,8 @@
private int addClassProvider(Class<?> c, DefaultBeanStore store)
{
BeanProvider p = createProviderMock();
- EasyMock.expect(
- p.getBeanClass(context.getInternalDependencyProvider()))
- .andStubReturn(c);
+ p.getBeanClass(context.getInternalDependencyProvider());
+ EasyMock.expectLastCall().andStubReturn(c);
int idx = nextIndex();
store.addBeanProvider(getProviderName(idx), p);
return idx;
@@ -396,10 +395,9 @@
int i = 0;
for (BeanProvider p : getProviders(idx, idx + count - 1))
{
+ p.getBeanClass((DependencyProvider) EasyMock.anyObject());
+ EasyMock.expectLastCall().andStubReturn(TEST_CLASSES[i]);
EasyMock.expect(
- p.getBeanClass((DependencyProvider) EasyMock.anyObject()))
- .andStubReturn(TEST_CLASSES[i]);
- EasyMock.expect(
p.getBean((DependencyProvider) EasyMock.anyObject()))
.andReturn(TEST_OBJECTS[i]).times(0, count + 1);
p.setLockID(LOCK_ID);
Modified: trunk/core/src/test/java/net/sf/jguiraffe/gui/forms/TestComponentStoreImpl.java
===================================================================
--- trunk/core/src/test/java/net/sf/jguiraffe/gui/forms/TestComponentStoreImpl.java 2011-07-16 20:22:27 UTC (rev 202)
+++ trunk/core/src/test/java/net/sf/jguiraffe/gui/forms/TestComponentStoreImpl.java 2011-07-27 19:38:57 UTC (rev 203)
@@ -19,10 +19,10 @@
import java.util.List;
import java.util.Set;
+import junit.framework.TestCase;
+
import org.easymock.EasyMock;
-import junit.framework.TestCase;
-
/**
* Test class for ComponentStoreImpl.
*
@@ -113,7 +113,8 @@
private FieldHandler createMockFieldHandler(int idx)
{
FieldHandler mock = EasyMock.createMock(FieldHandler.class);
- EasyMock.expect(mock.getComponentHandler()).andStubReturn(
+ mock.getComponentHandler();
+ EasyMock.expectLastCall().andStubReturn(
createMockComponentHandler(PRE_FIELDHANDLERS + idx));
EasyMock.replay(mock);
return mock;
Modified: trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/TestSwingTableModel.java
===================================================================
--- trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/TestSwingTableModel.java 2011-07-16 20:22:27 UTC (rev 202)
+++ trunk/core/src/test/java/net/sf/jguiraffe/gui/platform/swing/builder/components/table/TestSwingTableModel.java 2011-07-27 19:38:57 UTC (rev 203)
@@ -397,11 +397,11 @@
ComponentHandler<?> cmpHandler)
{
FieldHandler fldHandler = EasyMock.createMock(FieldHandler.class);
- EasyMock.expect(fldHandler.getComponentHandler()).andStubReturn(
- cmpHandler);
+ fldHandler.getComponentHandler();
+ EasyMock.expectLastCall().andStubReturn(cmpHandler);
EasyMock.expect(fldHandler.getPropertyName()).andStubReturn(null);
- EasyMock.expect(fldHandler.getType())
- .andStubReturn(COLUMN_TYPES[index]);
+ fldHandler.getType();
+ EasyMock.expectLastCall().andStubReturn(COLUMN_TYPES[index]);
return fldHandler;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
