Merge pull request #607 from renanigt/defaultConstructorMockSerializa…

…tionResult

Adding the default constructor for MockSerializationResult.

vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/xstream/XStreamBuilderImpl.java

@@ -16,11 +16,16 @@
 package br.com.caelum.vraptor.serialization.xstream;
 
 import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import br.com.caelum.vraptor.interceptor.DefaultTypeNameExtractor;
 import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
+import br.com.caelum.vraptor.util.test.MockInstanceImpl;
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.SingleValueConverter;
 
 /**
  * Implementation of default XStream configuration
@@ -48,6 +53,13 @@ public XStreamBuilderImpl(XStreamConverters converters, TypeNameExtractor extrac
 		this.extractor = extractor;
 	}
 
+	public static XStreamBuilder cleanInstance(Converter...converters) {
+		Instance<Converter> convertersInst = new MockInstanceImpl<>(converters);
+		Instance<SingleValueConverter> singleValueConverters = new MockInstanceImpl<>();
+		XStreamConverters xStreamConverters = new XStreamConverters(convertersInst, singleValueConverters);
+		return new XStreamBuilderImpl(xStreamConverters, new DefaultTypeNameExtractor());
+	}
+
 	@Override
 	public XStream xmlInstance() {
 		return configure(new VRaptorXStream(extractor));

vraptor-core/src/main/java/br/com/caelum/vraptor/util/test/MockSerializationResult.java

@@ -18,20 +18,28 @@
 package br.com.caelum.vraptor.util.test;
 
 
+import java.util.ArrayList;
+
 import javax.enterprise.inject.Vetoed;
 
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonSerializer;
+
 import br.com.caelum.vraptor.View;
 import br.com.caelum.vraptor.http.FormatResolver;
 import br.com.caelum.vraptor.interceptor.DefaultTypeNameExtractor;
+import br.com.caelum.vraptor.proxy.JavassistProxifier;
 import br.com.caelum.vraptor.proxy.Proxifier;
 import br.com.caelum.vraptor.serialization.DefaultRepresentationResult;
 import br.com.caelum.vraptor.serialization.JSONSerialization;
 import br.com.caelum.vraptor.serialization.RepresentationResult;
 import br.com.caelum.vraptor.serialization.Serialization;
 import br.com.caelum.vraptor.serialization.XMLSerialization;
+import br.com.caelum.vraptor.serialization.gson.GsonBuilderWrapper;
 import br.com.caelum.vraptor.serialization.gson.GsonJSONSerialization;
 import br.com.caelum.vraptor.serialization.gson.GsonSerializerBuilder;
 import br.com.caelum.vraptor.serialization.xstream.XStreamBuilder;
+import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl;
 import br.com.caelum.vraptor.serialization.xstream.XStreamXMLSerialization;
 import br.com.caelum.vraptor.view.EmptyResult;
 
@@ -62,6 +70,13 @@ public MockSerializationResult(Proxifier proxifier, XStreamBuilder xstreambuilde
 		this.gsonBuilder = gsonBuilder;
 	}
 
+	public MockSerializationResult() {
+		this(new JavassistProxifier(), XStreamBuilderImpl.cleanInstance(),
+				new GsonBuilderWrapper(new MockInstanceImpl<>(new ArrayList<JsonSerializer<?>>()), 
+						new MockInstanceImpl<>(new ArrayList<JsonDeserializer<?>>()))
+		);
+	}
+
 	@Override
 	public <T extends View> T use(final Class<T> view) {
 		this.typeToUse = view;

vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/I18nMessageSerializationTest.java

@@ -43,7 +43,7 @@
 import br.com.caelum.vraptor.serialization.gson.MessageGsonConverter;
 import br.com.caelum.vraptor.serialization.xstream.MessageConverter;
 import br.com.caelum.vraptor.serialization.xstream.XStreamBuilder;
-import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderFactory;
+import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl;
 import br.com.caelum.vraptor.serialization.xstream.XStreamXMLSerialization;
 import br.com.caelum.vraptor.util.test.MockInstanceImpl;
 import br.com.caelum.vraptor.validator.SingletonResourceBundle;
@@ -62,7 +62,7 @@ public void setup() throws Exception {
 		HttpServletResponse response = mock(HttpServletResponse.class);
 		when(response.getWriter()).thenReturn(new PrintWriter(stream));
 		DefaultTypeNameExtractor extractor = new DefaultTypeNameExtractor();
-		XStreamBuilder builder = XStreamBuilderFactory.cleanInstance(new MessageConverter());
+		XStreamBuilder builder = XStreamBuilderImpl.cleanInstance(new MessageConverter());
 		XStreamXMLSerialization xmlSerialization = new XStreamXMLSerialization(response, builder);
 
 		List<JsonSerializer<?>> jsonSerializers = new ArrayList<>();

vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXMLSerializationTest.java

@@ -15,7 +15,7 @@
  */
 package br.com.caelum.vraptor.serialization.xstream;
 
-import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderFactory.cleanInstance;
+import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl.cleanInstance;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXmlDeserializerTest.java

@@ -15,7 +15,7 @@
  */
 package br.com.caelum.vraptor.serialization.xstream;
 
-import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderFactory.cleanInstance;
+import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl.cleanInstance;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;

vraptor-core/src/test/java/br/com/caelum/vraptor/util/test/MockSerializationResultTest.java

@@ -15,35 +15,21 @@
  */
 package br.com.caelum.vraptor.util.test;
 
-import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderFactory.cleanInstance;
 import static br.com.caelum.vraptor.view.Results.json;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import br.com.caelum.vraptor.proxy.JavassistProxifier;
-import br.com.caelum.vraptor.serialization.gson.GsonBuilderWrapper;
-
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonSerializer;
-
 public class MockSerializationResultTest {
 
 	private MockSerializationResult result;
 
 	@Before
 	public void setUp() throws Exception {
-		List<JsonSerializer<?>> jsonSerializers = new ArrayList<>();
-		List<JsonDeserializer<?>> jsonDeserializers = new ArrayList<>();
-
-		result = new MockSerializationResult(new JavassistProxifier(), cleanInstance(),
-				new GsonBuilderWrapper(new MockInstanceImpl<>(jsonSerializers), new MockInstanceImpl<>(jsonDeserializers)));
+		result = new MockSerializationResult();
 	}
 
 	public static class Car {

vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultStatusTest.java

@@ -15,7 +15,7 @@
  */
 package br.com.caelum.vraptor.view;
 
-import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderFactory.cleanInstance;
+import static br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl.cleanInstance;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;