fixes #41 migrate all integration test (or delete useless ones)

src/inttest/java/com/faforever/api/data/AvatarElideTest.java

@@ -0,0 +1,52 @@
+package com.faforever.api.data;
+
+import com.faforever.api.AbstractIntegrationTest;
+import com.faforever.api.avatar.AvatarRepository;
+import com.faforever.api.data.domain.Avatar;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.test.web.servlet.MvcResult;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepDefaultUser.sql")
+@Sql(executionPhase = ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/prepAvatarData.sql")
+@Sql(executionPhase = ExecutionPhase.AFTER_TEST_METHOD, scripts = "classpath:sql/cleanAvatarData.sql")
+public class AvatarElideTest extends AbstractIntegrationTest {
+  @Autowired
+  AvatarRepository avatarRepository;
+
+  @Test
+  public void getUnusedAvatar() throws Exception {
+    Avatar avatar = avatarRepository.findOne(1);
+
+    MvcResult result = mockMvc.perform(get("/data/avatar/1"))
+      .andExpect(status().isOk())
+      .andExpect(jsonPath("$.data.id", is(String.valueOf(avatar.getId()))))
+      .andExpect(jsonPath("$.data.type", is("avatar")))
+      .andExpect(jsonPath("$.data.attributes.tooltip", is(avatar.getTooltip())))
+      .andExpect(jsonPath("$.data.attributes.url", is(avatar.getUrl())))
+      .andExpect(jsonPath("$.data.relationships.assignments.data", hasSize(0)))
+      .andReturn();
+  }
+
+  @Test
+  public void getAvatarWithPlayer() throws Exception {
+    Avatar avatar = avatarRepository.findOne(2);
+
+    MvcResult result = mockMvc.perform(get("/data/avatar/2"))
+      .andExpect(status().isOk())
+      .andExpect(jsonPath("$.data.id", is(String.valueOf(avatar.getId()))))
+      .andExpect(jsonPath("$.data.type", is("avatar")))
+      .andExpect(jsonPath("$.data.attributes.tooltip", is(avatar.getTooltip())))
+      .andExpect(jsonPath("$.data.attributes.url", is(avatar.getUrl())))
+      .andExpect(jsonPath("$.data.relationships.assignments.data", hasSize(2)))
+      .andReturn();
+  }
+}

src/inttest/java/com/faforever/api/clan/ClanElideTest.java → src/inttest/java/com/faforever/api/data/ClanElideTest.java

@@ -1,6 +1,7 @@
-package com.faforever.api.clan;
+package com.faforever.api.data;
 
 import com.faforever.api.AbstractIntegrationTest;
+import com.faforever.api.clan.ClanRepository;
 import com.faforever.api.data.domain.Clan;
 import com.faforever.api.data.domain.ClanMembership;
 import com.faforever.api.data.domain.Player;

src/inttest/resources/sql/cleanAvatarData.sql

@@ -0,0 +1,3 @@
+DELETE FROM avatars;
+DELETE FROM avatars_list;
+

src/inttest/resources/sql/prepAvatarData.sql

@@ -0,0 +1,10 @@
+DELETE FROM avatars;
+DELETE FROM avatars_list;
+
+INSERT INTO avatars_list (id, url, tooltip) VALUES
+  (1, 'http://localhost/avatar1.png', 'Avatar No. 1'),
+  (2, 'http://localhost/avatar2.png', 'Avatar No. 2');
+
+INSERT INTO avatars (id, idUser, idAvatar, selected) VALUES
+  (1, 1, 2, 1),
+  (2, 2, 2, 0);

src/test/java/com/faforever/integration/factories/ClanFactory.java → src/test/java/com/faforever/api/clan/ClanFactory.java

@@ -1,4 +1,4 @@
-package com.faforever.integration.factories;
+package com.faforever.api.clan;
 
 import com.faforever.api.data.domain.Clan;
 import com.faforever.api.data.domain.Player;

src/test/java/com/faforever/api/clan/ClanServiceTest.java

@@ -12,7 +12,6 @@
 import com.faforever.api.player.PlayerRepository;
 import com.faforever.api.player.PlayerService;
 import com.faforever.api.security.JwtService;
-import com.faforever.integration.factories.ClanFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Rule;

src/test/java/com/faforever/api/data/listeners/ClanEnricherListenerTest.java

@@ -1,8 +1,8 @@
 package com.faforever.api.data.listeners;
 
+import com.faforever.api.clan.ClanFactory;
 import com.faforever.api.config.FafApiProperties;
 import com.faforever.api.data.domain.Clan;
-import com.faforever.integration.factories.ClanFactory;
 import org.junit.Before;
 import org.junit.Test;