Skip to content

Commit 56add6d

Browse files
committed
fix: updated test to mock folderconfig
1 parent ecbfaae commit 56add6d

3 files changed

Lines changed: 37 additions & 14 deletions

File tree

plugin/src/main/java/io/snyk/eclipse/plugin/properties/preferences/FolderConfigs.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.snyk.languageserver.protocolextension.messageObjects.FolderConfigsParam;
1717

1818
public class FolderConfigs {
19-
private static FolderConfigs instance;
19+
protected static FolderConfigs instance;
2020
private static final IEclipsePreferences preferenceState = InstanceScope.INSTANCE.getNode("io.snyk.eclipse.plugin");
2121
private static final Gson gson = new Gson();
2222

@@ -102,4 +102,9 @@ private FolderConfigsParam getFolderConfigs(List<String> folderPaths) {
102102
}
103103
return new FolderConfigsParam(folderConfigs);
104104
}
105+
106+
public static void setInstance(FolderConfigs folderConfigs) {
107+
instance = folderConfigs;
108+
109+
}
105110
}
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package io.snyk.languageserver.protocolextension.messageObjects;
22

3-
import com.google.gson.annotations.SerializedName;
43
import java.util.List;
54

5+
import com.google.gson.annotations.SerializedName;
6+
67
public class FolderConfigsParam {
78

8-
@SerializedName("folderConfigs")
9-
private List<FolderConfig> folderConfigs;
9+
@SerializedName("folderConfigs")
10+
private List<FolderConfig> folderConfigs;
1011

11-
public FolderConfigsParam(List<FolderConfig> folderConfigs) {
12-
this.folderConfigs = folderConfigs;
13-
}
12+
public FolderConfigsParam(List<FolderConfig> folderConfigs) {
13+
this.folderConfigs = folderConfigs;
14+
}
1415

15-
public List<FolderConfig> getFolderConfigs() {
16-
return folderConfigs;
17-
}
16+
public List<FolderConfig> getFolderConfigs() {
17+
return folderConfigs;
18+
}
1819

19-
public void setFolderConfigs(List<FolderConfig> folderConfigs) {
20-
this.folderConfigs = folderConfigs;
21-
}
20+
public void setFolderConfigs(List<FolderConfig> folderConfigs) {
21+
this.folderConfigs = folderConfigs;
22+
}
2223
}

tests/src/test/java/io/snyk/languageserver/LsConfigurationUpdaterTest.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,45 @@
11
package io.snyk.languageserver;
22

33
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
4-
//import static org.junit.Assert.assertArrayEquals;
54
import static org.junit.jupiter.api.Assertions.assertEquals;
65
import static org.mockito.Mockito.mock;
76
import static org.mockito.Mockito.when;
87

8+
import java.util.ArrayList;
9+
910
import org.apache.commons.lang3.SystemUtils;
1011
import org.eclipse.core.runtime.Platform;
1112
import org.junit.jupiter.api.BeforeEach;
1213
import org.junit.jupiter.api.Test;
14+
import org.mockito.Mock;
1315
import org.mockito.MockedStatic;
1416
import org.mockito.Mockito;
1517
import org.osgi.framework.Bundle;
1618
import org.osgi.framework.Version;
1719

1820
import io.snyk.eclipse.plugin.Activator;
21+
import io.snyk.eclipse.plugin.properties.preferences.FolderConfigs;
1922
import io.snyk.eclipse.plugin.properties.preferences.Preferences;
2023
import io.snyk.eclipse.plugin.properties.preferences.PreferencesUtils;
2124
import io.snyk.languageserver.download.LsBinaries;
25+
import io.snyk.languageserver.protocolextension.messageObjects.FolderConfigsParam;
2226

2327
class LsConfigurationUpdaterTest {
2428
private Preferences preferenceMock;
2529

30+
@Mock
31+
private FolderConfigsParam folderConfigsParamMock;
32+
33+
FolderConfigs mockFolderConfigs;
34+
2635
@BeforeEach
2736
protected void setUp() {
2837
preferenceMock = mock(Preferences.class);
2938
PreferencesUtils.setPreferences(preferenceMock);
39+
40+
mockFolderConfigs = mock(FolderConfigs.class);
41+
FolderConfigs.setInstance(mockFolderConfigs);
42+
3043
}
3144

3245
@Test
@@ -105,5 +118,9 @@ private void setupPreferenceMock() {
105118
when(preferenceMock.getBooleanPref(Preferences.SCANNING_MODE_AUTOMATIC)).thenReturn(true);
106119
when(preferenceMock.getBooleanPref(Preferences.USE_TOKEN_AUTH, false)).thenReturn(true);
107120
when(preferenceMock.getPref(Preferences.FILTER_DELTA_NEW_ISSUES, Boolean.FALSE.toString())).thenReturn("true");
121+
122+
FolderConfigsParam mockFolderConfigsParam = new FolderConfigsParam(new ArrayList<>());
123+
when(mockFolderConfigs.updateFolderConfigs()).thenReturn(mockFolderConfigsParam);
124+
108125
}
109126
}

0 commit comments

Comments
 (0)