Remove old v1 API, deprecate v2 API, add v3 API

This commit is contained in:
Gabriele C
2017-04-14 01:01:30 +02:00
parent 88a965971d
commit 8ecdd1f4d3
5 changed files with 278 additions and 179 deletions
@@ -2,6 +2,7 @@ package fr.xephi.authme.api;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.api.v3.AuthMeAPI;
import fr.xephi.authme.data.auth.PlayerAuth;
import fr.xephi.authme.data.auth.PlayerCache;
import fr.xephi.authme.datasource.DataSource;
@@ -35,13 +36,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* Test for {@link NewAPI}.
* Test for {@link fr.xephi.authme.api.v3.AuthMeAPI}.
*/
@RunWith(MockitoJUnitRunner.class)
public class NewAPITest {
public class AuthMeAPIv3Test {
@InjectMocks
private NewAPI api;
private AuthMeAPI api;
@Mock
private AuthMe authMe;
@@ -60,11 +61,11 @@ public class NewAPITest {
@Test
public void shouldReturnInstanceOrNull() {
NewAPI result = NewAPI.getInstance();
AuthMeAPI result = AuthMeAPI.getInstance();
assertThat(result, sameInstance(api));
ReflectionTestUtils.setField(NewAPI.class, null, "singleton", null);
assertThat(NewAPI.getInstance(), nullValue());
ReflectionTestUtils.setField(AuthMeAPI.class, null, "singleton", null);
assertThat(AuthMeAPI.getInstance(), nullValue());
}
@Test