Skip to content

Commit

Permalink
Merge pull request #614 from renanigt/fixingMusicJungle
Browse files Browse the repository at this point in the history
Refactoring vraptor-musicjungle's tests
  • Loading branch information
garcia-jj committed Jun 19, 2014
2 parents 6be411b + a7f1748 commit 36c121d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 37 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -33,16 +32,10 @@
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.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;
Expand All @@ -64,13 +57,8 @@ public class MusicControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);

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();
validator = new MockValidator();
controller = new MusicController(dao, userInfo, result, validator, musics);

Expand Down

This file was deleted.

0 comments on commit 36c121d

Please sign in to comment.