svn commit: r1353153 - /rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java

[mf...@apache.org]

Author: mfranklin
Date: Sat Jun 23 15:50:39 2012
New Revision: 1353153

URL: http://svn.apache.org/viewvc?rev=1353153&view=rev
Log:
Applied fix for RAVE-689

Modified:
    rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java

Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java?rev=1353153&r1=1353152&r2=1353153&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java Sat Jun 23 15:50:39 2012
@@ -4,47 +4,34 @@ import org.apache.rave.model.ModelConver
 import org.apache.rave.portal.model.Person;
 import org.apache.rave.portal.model.impl.PersonImpl;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 
 /**
- */
+ */@RunWith(SpringJUnit4ClassRunner.class)
+   @ContextConfiguration(locations = {"classpath:test-applicationContext.xml",
+           "classpath:test-dataContext.xml"})
 public class ConvertingListProxyFactoryTest {
 
-    // TODO: RAVE-689 temporary fix/workaround 
-    private static class StaticConvertersAccessor extends JpaConverter {
-        private StaticConvertersAccessor(List<ModelConverter> converters) {
-            super(converters);
-        }
-        public static Map<Class<?>, ModelConverter> getConverters() {
-            return JpaConverter.getInstance().converterMap;
-        }
-        public static void setConverters(Map<Class<?>, ModelConverter> converters) {
-           JpaConverter.getInstance().converterMap = converters;
-        }
-    }
-    
-    private Map<Class<?>, ModelConverter> savedConverters;
-    
-    @Before
-    public void setup() {
-        savedConverters = StaticConvertersAccessor.getConverters();
-    }
-    
+    @Autowired
+    private List<ModelConverter> originalConverters;
+
     @After
     public void teardown() {
-        StaticConvertersAccessor.setConverters(savedConverters);
+        new JpaConverter(originalConverters);
     }
-    // end TODO: RAVE-689 temporary fix/workaround 
 
     @Test
     public void createProxy() {