From c2b3cfc8ab5da33dd35c9909508649dec819b622 Mon Sep 17 00:00:00 2001 From: Renan Date: Thu, 19 Jun 2014 01:29:59 -0300 Subject: [PATCH 1/4] Removing unnecessary class --- .../serialization/XStreamBuilderFactory.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/serialization/XStreamBuilderFactory.java diff --git a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/serialization/XStreamBuilderFactory.java b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/serialization/XStreamBuilderFactory.java deleted file mode 100644 index 6305e02cb..000000000 --- a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/serialization/XStreamBuilderFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -package br.com.caelum.vraptor.musicjungle.serialization; - -import javax.enterprise.inject.Instance; - -import br.com.caelum.vraptor.interceptor.DefaultTypeNameExtractor; -import br.com.caelum.vraptor.serialization.xstream.XStreamBuilder; -import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl; -import br.com.caelum.vraptor.serialization.xstream.XStreamConverters; -import br.com.caelum.vraptor.util.test.MockInstanceImpl; - -import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.converters.SingleValueConverter; - -public class XStreamBuilderFactory { - - public static XStreamBuilder cleanInstance(Converter...converters) { - Instance convertersInst = new MockInstanceImpl<>(converters); - Instance singleValueConverters = new MockInstanceImpl<>(); - XStreamConverters xStreamConverters = new XStreamConverters(convertersInst, singleValueConverters); - return new XStreamBuilderImpl(xStreamConverters, new DefaultTypeNameExtractor()); - } - -} From 43251567a504b2476f73c1ef4a4c3d6e01ed1c1c Mon Sep 17 00:00:00 2001 From: Renan Date: Thu, 19 Jun 2014 01:30:37 -0300 Subject: [PATCH 2/4] Adding the default constructor. --- .../controller/MusicControllerTest.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java index db454833c..1e251b8ad 100644 --- a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java +++ b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java @@ -1,6 +1,5 @@ package br.com.caelum.vraptor.musicjungle.controller; -import static br.com.caelum.vraptor.musicjungle.serialization.XStreamBuilderFactory.cleanInstance; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; @@ -33,16 +32,11 @@ import br.com.caelum.vraptor.musicjungle.util.model.MusicBuilder; import br.com.caelum.vraptor.musicjungle.util.model.UserBuilder; import br.com.caelum.vraptor.observer.upload.UploadedFile; -import br.com.caelum.vraptor.proxy.JavassistProxifier; -import br.com.caelum.vraptor.serialization.gson.GsonBuilderWrapper; +import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl; import br.com.caelum.vraptor.util.test.MockHttpResult; -import br.com.caelum.vraptor.util.test.MockInstanceImpl; import br.com.caelum.vraptor.util.test.MockSerializationResult; import br.com.caelum.vraptor.util.test.MockValidator; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonSerializer; - public class MusicControllerTest { private MockSerializationResult result; @@ -65,11 +59,9 @@ public class MusicControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - List> jsonSerializers = new ArrayList<>(); - List> jsonDeserializers = new ArrayList<>(); + XStreamBuilderImpl.cleanInstance(); - result = new MockSerializationResult(new JavassistProxifier(), cleanInstance(), - new GsonBuilderWrapper(new MockInstanceImpl<>(jsonSerializers), new MockInstanceImpl<>(jsonDeserializers))); + result = new MockSerializationResult(); validator = new MockValidator(); controller = new MusicController(dao, userInfo, result, validator, musics); From 785a35a9e786f2c331732398570bebb0a7b1b91d Mon Sep 17 00:00:00 2001 From: Renan Date: Thu, 19 Jun 2014 01:32:29 -0300 Subject: [PATCH 3/4] Removing unnecessary code. --- .../vraptor/musicjungle/controller/MusicControllerTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java index 1e251b8ad..a2d471c39 100644 --- a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java +++ b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java @@ -58,11 +58,8 @@ public class MusicControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - - XStreamBuilderImpl.cleanInstance(); - + result = new MockSerializationResult(); - validator = new MockValidator(); controller = new MusicController(dao, userInfo, result, validator, musics); From a7f1748267cf0d434ccb2edf1476eaa78c4b85ce Mon Sep 17 00:00:00 2001 From: Renan Date: Thu, 19 Jun 2014 01:33:30 -0300 Subject: [PATCH 4/4] Removing unnecessary imports. --- .../vraptor/musicjungle/controller/MusicControllerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java index a2d471c39..eda8a23a3 100644 --- a/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java +++ b/vraptor-musicjungle/src/test/java/br/com/caelum/vraptor/musicjungle/controller/MusicControllerTest.java @@ -32,7 +32,6 @@ import br.com.caelum.vraptor.musicjungle.util.model.MusicBuilder; import br.com.caelum.vraptor.musicjungle.util.model.UserBuilder; import br.com.caelum.vraptor.observer.upload.UploadedFile; -import br.com.caelum.vraptor.serialization.xstream.XStreamBuilderImpl; import br.com.caelum.vraptor.util.test.MockHttpResult; import br.com.caelum.vraptor.util.test.MockSerializationResult; import br.com.caelum.vraptor.util.test.MockValidator;