Revision 33348

View differences:

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/tools/persistence/FontPersistenceFactoryTest.java
29 29
import java.awt.Font;
30 30

  
31 31
import org.easymock.MockControl;
32
import org.gvsig.fmap.mapcontext.tools.persistence.FontPersistenceFactory;
32
import org.gvsig.tools.ToolsLocator;
33 33
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
34
import org.gvsig.tools.persistence.PersistenceManager;
34 35
import org.gvsig.tools.persistence.PersistentState;
35 36

  
36 37
/**
......
46 47
	private Font font;
47 48

  
48 49
	protected void doSetUp() throws Exception {
49
		factory = new FontPersistenceFactory();
50
		PersistenceManager persistenceManager = ToolsLocator
51
				.getPersistenceManager();
52
		factory = (FontPersistenceFactory) persistenceManager.getFactories()
53
				.get(Font.class);
50 54
		stateControl = MockControl.createNiceControl(PersistentState.class);
51 55
		state = (PersistentState) stateControl.getMock();
52 56
		font = new Font("Arial", Font.BOLD, 18);
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/tools/persistence/ColorPersistenceFactoryTest.java
29 29
import java.awt.Color;
30 30

  
31 31
import org.easymock.MockControl;
32
import org.gvsig.fmap.mapcontext.tools.persistence.ColorPersistenceFactory;
32
import org.gvsig.tools.ToolsLocator;
33 33
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
34
import org.gvsig.tools.persistence.PersistenceManager;
34 35
import org.gvsig.tools.persistence.PersistentState;
35 36

  
36 37
/**
37 38
 * Unit tests for the class {@link ColorPersistenceFactory}.
38 39
 * 
39
 * @author 2009- <a href="cordinyana@gvsig.org">C?sar Ordi?ana</a> - gvSIG team
40
 * @author gvSIG team
40 41
 */
41 42
public class ColorPersistenceFactoryTest extends
42 43
		AbstractLibraryAutoInitTestCase {
......
47 48
	private Color color;
48 49

  
49 50
	protected void doSetUp() throws Exception {
50
		factory = new ColorPersistenceFactory();
51
		PersistenceManager persistenceManager = ToolsLocator
52
				.getPersistenceManager();
53
		factory = (ColorPersistenceFactory) persistenceManager.getFactories()
54
				.get(Color.class);
51 55
		stateControl = MockControl.createNiceControl(PersistentState.class);
52 56
		state = (PersistentState) stateControl.getMock();
53 57
		color = Color.magenta;
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/tools/persistence/Point2DPersistenceFactoryTest.java
29 29
import java.awt.geom.Point2D;
30 30

  
31 31
import org.easymock.MockControl;
32
import org.gvsig.fmap.mapcontext.tools.persistence.Point2DPersistenceFactory;
32
import org.gvsig.tools.ToolsLocator;
33 33
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
34
import org.gvsig.tools.persistence.PersistenceManager;
34 35
import org.gvsig.tools.persistence.PersistentState;
35 36

  
36 37
/**
......
47 48
	private Point2D point;
48 49

  
49 50
	protected void doSetUp() throws Exception {
50
		factory = new Point2DPersistenceFactory();
51
		PersistenceManager persistenceManager = ToolsLocator
52
				.getPersistenceManager();
53
		factory = (Point2DPersistenceFactory) persistenceManager.getFactories()
54
				.get(Point2D.class);
51 55
		stateControl = MockControl.createNiceControl(PersistentState.class);
52 56
		state = (PersistentState) stateControl.getMock();
53 57
		double x = Math.random() * 1000d;

Also available in: Unified diff