Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix reflective access in test classes #3322

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Fix reflective access in test classes #3322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a33a6
Fix illegal LogManager reflective access
RoiEXLab Mar 27, 2018
5b40d0b
Fix illegal reflective access to java.io.File with annotations
RoiEXLab Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions game-core/src/test/java/games/strategy/debug/LoggingConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Spy;

import com.example.mockito.MockitoExtension;

@ExtendWith(MockitoExtension.class)
public final class LoggingConfigurationTest {
@Spy
private final LogManager logManager = LogManager.getLogManager();
@Mock
private LogManager logManager;

private final Properties systemProperties = new Properties();

Expand Down
15 changes: 9 additions & 6 deletions game-core/src/test/java/games/strategy/engine/ClientFileSystemHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ public final class ClientFileSystemHelperTest {
@ExtendWith(MockitoExtension.class)
@Nested
public final class GetFolderContainingFileWithNameTest {
@Spy
private final File file = new File("filename.ext");
@Mock
private File file;

@Spy
private final File parentFolder = new File("parent");
@Mock
private File parentFolder;

@Spy
private final File startFolder = new File("start");
@Mock
private File startFolder;

private File getFolderContainingFileWithName() throws Exception {
return ClientFileSystemHelper.getFolderContainingFileWithName(file.getName(), startFolder);
Expand All @@ -40,6 +40,9 @@ private File getFolderContainingFileWithName() throws Exception {
public void setUp() {
when(file.isFile()).thenReturn(true);
when(startFolder.getParentFile()).thenReturn(parentFolder);
when(file.getName()).thenReturn("filename.ext");
when(parentFolder.getName()).thenReturn("parent");
when(startFolder.getName()).thenReturn("start");
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions game-core/src/test/java/games/strategy/io/FileUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Spy;

import com.example.mockito.MockitoExtension;
Expand All @@ -19,8 +20,8 @@ public final class FileUtilsTest {
@ExtendWith(MockitoExtension.class)
@Nested
public final class ListFilesTest {
@Spy
private final File directory = new File("");
@Mock
private File directory;

@Test
public void shouldReturnFileCollectionWhenTargetIsDirectory() {
Expand Down