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

[at...@apache.org]

Author: ate
Date: Fri Jun 22 21:34:57 2012
New Revision: 1353036

URL: http://svn.apache.org/viewvc?rev=1353036&view=rev
Log:
Temporary workaround for RAVE-689: JpaConverter static converterMap can get 'corrupted' across multiple unit tests and causing tests to fail
See: https://issues.apache.org/jira/browse/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=1353036&r1=1353035&r2=1353036&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 Fri Jun 22 21:34:57 2012
@@ -3,11 +3,14 @@ package org.apache.rave.portal.model.con
 import org.apache.rave.model.ModelConverter;
 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 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.*;
@@ -17,6 +20,31 @@ import static org.junit.Assert.assertTha
  */
 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();
+    }
+    
+    @After
+    public void teardown() {
+        StaticConvertersAccessor.setConverters(savedConverters);
+    }
+    // end TODO: RAVE-689 temporary fix/workaround 
 
     @Test
     public void createProxy() {