Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AuthMe initialization test after update to 1.11

Browse Source
This commit is contained in:
ljacqu 2016-11-17 22:07:39 +01:00
parent 2fbf8b6c71
commit a196420eca
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -85,8 +85,7 @@ public class AuthMe extends JavaPlugin {
*/ */
@VisibleForTesting @VisibleForTesting
@SuppressWarnings("deprecation") // the super constructor is deprecated to mark it for unit testing only @SuppressWarnings("deprecation") // the super constructor is deprecated to mark it for unit testing only
protected AuthMe(final JavaPluginLoader loader, final Server server, final PluginDescriptionFile description, protected AuthMe(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
final File dataFolder, final File file) {
super(loader, description, dataFolder, file); super(loader, description, dataFolder, file);
} }

9
src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
View File

@ -49,9 +49,6 @@ import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class AuthMeInitializationTest { public class AuthMeInitializationTest {
@Mock
private JavaPluginLoader pluginLoader;
@Mock @Mock
private Server server; private Server server;
@ -60,7 +57,6 @@ public class AuthMeInitializationTest {
private AuthMe authMe; private AuthMe authMe;
private File dataFolder; private File dataFolder;
private File settingsFile;
@Rule @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();
@ -73,7 +69,8 @@ public class AuthMeInitializationTest {
@Before @Before
public void initAuthMe() throws IOException { public void initAuthMe() throws IOException {
dataFolder = temporaryFolder.newFolder(); dataFolder = temporaryFolder.newFolder();
settingsFile = new File(dataFolder, "config.yml"); File settingsFile = new File(dataFolder, "config.yml");
JavaPluginLoader pluginLoader = new JavaPluginLoader(server);
Files.copy(TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "config.test.yml"), settingsFile); Files.copy(TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "config.test.yml"), settingsFile);
// Mock / wire various Bukkit components // Mock / wire various Bukkit components
@ -86,7 +83,7 @@ public class AuthMeInitializationTest {
"AuthMe", "N/A", AuthMe.class.getCanonicalName()); "AuthMe", "N/A", AuthMe.class.getCanonicalName());
// Initialize AuthMe // Initialize AuthMe
authMe = new AuthMe(pluginLoader, server, descriptionFile, dataFolder, null); authMe = new AuthMe(pluginLoader, descriptionFile, dataFolder, null);
} }
@Test @Test