Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit fa4876b

Browse files
committed
Fixed unit-test UploaderFactoryTest
It was broken after merging #4107
1 parent 376cb56 commit fa4876b

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

‎app/test/processing/app/debug/UploaderFactoryTest.java‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@
2929

3030
package processing.app.debug;
3131

32+
import static org.junit.Assert.assertTrue;
33+
34+
import java.util.HashMap;
35+
36+
import org.junit.Test;
37+
3238
import cc.arduino.packages.BoardPort;
3339
import cc.arduino.packages.Uploader;
3440
import cc.arduino.packages.UploaderFactory;
41+
import cc.arduino.packages.uploaders.GenericNetworkUploader;
3542
import cc.arduino.packages.uploaders.SSHUploader;
3643
import cc.arduino.packages.uploaders.SerialUploader;
37-
import org.junit.Test;
3844
import processing.app.AbstractWithPreferencesTest;
3945
import processing.app.helpers.PreferencesMap;
4046

41-
import java.util.HashMap;
42-
43-
import static org.junit.Assert.assertTrue;
44-
4547
public class UploaderFactoryTest extends AbstractWithPreferencesTest {
4648

4749
@Test
@@ -52,11 +54,26 @@ public void shouldCreateAnInstanceOfSSHUploader() throws Exception {
5254
boardPort.setBoardName("yun");
5355
boardPort.setAddress("192.168.0.1");
5456
boardPort.setProtocol("network");
57+
boardPort.getPrefs().put("ssh_upload", "yes");
5558
Uploader uploader = new UploaderFactory().newUploader(board, boardPort, false);
5659

5760
assertTrue(uploader instanceof SSHUploader);
5861
}
5962

63+
@Test
64+
public void shouldCreateAnInstanceOfGenericNetworkUploader() throws Exception {
65+
TargetBoard board = new LegacyTargetBoard("yun", new PreferencesMap(new HashMap<String, String>()), new TargetPlatformStub("id", new TargetPackageStub("id")));
66+
67+
BoardPort boardPort = new BoardPort();
68+
boardPort.setBoardName("yun");
69+
boardPort.setAddress("192.168.0.1");
70+
boardPort.setProtocol("network");
71+
boardPort.getPrefs().put("ssh_upload", "no");
72+
Uploader uploader = new UploaderFactory().newUploader(board, boardPort, false);
73+
74+
assertTrue(uploader instanceof GenericNetworkUploader);
75+
}
76+
6077
@Test
6178
public void shouldCreateAnInstanceOfBasicUploaderWhenPortIsSerial() throws Exception {
6279
TargetBoard board = new LegacyTargetBoard("uno", new PreferencesMap(new HashMap<String, String>()), new TargetPlatformStub("id", new TargetPackageStub("id")));

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /