rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Removed TargetBoard parameter from newUploader factory

Browse Source 
The parameter is not used.
This commit is contained in:
Cristian Maglie 2020-07-20 13:44:13 +02:00
parent 80dc652ceb
commit bbb81671d6
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/test/processing/app/debug/UploaderFactoryTest.java
View File

@ -42,47 +42,40 @@ import cc.arduino.packages.uploaders.GenericNetworkUploader;
import cc.arduino.packages.uploaders.SSHUploader; import cc.arduino.packages.uploaders.SSHUploader;
import cc.arduino.packages.uploaders.SerialUploader; import cc.arduino.packages.uploaders.SerialUploader;
import processing.app.AbstractWithPreferencesTest; import processing.app.AbstractWithPreferencesTest;
import processing.app.helpers.PreferencesMap;
public class UploaderFactoryTest extends AbstractWithPreferencesTest { public class UploaderFactoryTest extends AbstractWithPreferencesTest {
@Test @Test
public void shouldCreateAnInstanceOfSSHUploader() throws Exception { public void shouldCreateAnInstanceOfSSHUploader() throws Exception {
TargetBoard board = new LegacyTargetBoard("yun", new PreferencesMap(new HashMap<String, String>()), new TargetPlatformStub("id", new TargetPackageStub("id")));
BoardPort boardPort = new BoardPort(); BoardPort boardPort = new BoardPort();
boardPort.setBoardName("yun"); boardPort.setBoardName("yun");
boardPort.setAddress("192.168.0.1"); boardPort.setAddress("192.168.0.1");
boardPort.setProtocol("network"); boardPort.setProtocol("network");
boardPort.getPrefs().put("ssh_upload", "yes"); boardPort.getPrefs().put("ssh_upload", "yes");
Uploader uploader = new UploaderFactory().newUploader(board, boardPort, false); Uploader uploader = new UploaderFactory().newUploader(boardPort, false);
assertTrue(uploader instanceof SSHUploader); assertTrue(uploader instanceof SSHUploader);
} }
@Test @Test
public void shouldCreateAnInstanceOfGenericNetworkUploader() throws Exception { public void shouldCreateAnInstanceOfGenericNetworkUploader() throws Exception {
TargetBoard board = new LegacyTargetBoard("yun", new PreferencesMap(new HashMap<String, String>()), new TargetPlatformStub("id", new TargetPackageStub("id")));
BoardPort boardPort = new BoardPort(); BoardPort boardPort = new BoardPort();
boardPort.setBoardName("yun"); boardPort.setBoardName("yun");
boardPort.setAddress("192.168.0.1"); boardPort.setAddress("192.168.0.1");
boardPort.setProtocol("network"); boardPort.setProtocol("network");
boardPort.getPrefs().put("ssh_upload", "no"); boardPort.getPrefs().put("ssh_upload", "no");
Uploader uploader = new UploaderFactory().newUploader(board, boardPort, false); Uploader uploader = new UploaderFactory().newUploader(boardPort, false);
assertTrue(uploader instanceof GenericNetworkUploader); assertTrue(uploader instanceof GenericNetworkUploader);
} }
@Test @Test
public void shouldCreateAnInstanceOfBasicUploaderWhenPortIsSerial() throws Exception { public void shouldCreateAnInstanceOfBasicUploaderWhenPortIsSerial() throws Exception {
TargetBoard board = new LegacyTargetBoard("uno", new PreferencesMap(new HashMap<String, String>()), new TargetPlatformStub("id", new TargetPackageStub("id")));
BoardPort boardPort = new BoardPort(); BoardPort boardPort = new BoardPort();
boardPort.setBoardName("Arduino Leonardo"); boardPort.setBoardName("Arduino Leonardo");
boardPort.setAddress("/dev/ttyACM0"); boardPort.setAddress("/dev/ttyACM0");
boardPort.setProtocol("serial"); boardPort.setProtocol("serial");
Uploader uploader = new UploaderFactory().newUploader(board, boardPort, false); Uploader uploader = new UploaderFactory().newUploader(boardPort, false);
assertTrue(uploader instanceof SerialUploader); assertTrue(uploader instanceof SerialUploader);
} }

4
arduino-core/src/cc/arduino/UploaderUtils.java
View File

@ -35,7 +35,6 @@ import cc.arduino.packages.UploaderFactory;
import processing.app.BaseNoGui; import processing.app.BaseNoGui;
import processing.app.PreferencesData; import processing.app.PreferencesData;
import processing.app.Sketch; import processing.app.Sketch;
import processing.app.debug.TargetBoard;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -51,8 +50,7 @@ public class UploaderUtils {
boardPort = BaseNoGui.getDiscoveryManager().find(port); boardPort = BaseNoGui.getDiscoveryManager().find(port);
} }
TargetBoard board = BaseNoGui.getTargetBoard(); return new UploaderFactory().newUploader(boardPort, noUploadPort);
return new UploaderFactory().newUploader(board, boardPort, noUploadPort);
} }
public boolean upload(Sketch data, Uploader uploader, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception { public boolean upload(Sketch data, Uploader uploader, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception {

3
arduino-core/src/cc/arduino/packages/UploaderFactory.java
View File

@ -32,11 +32,10 @@ package cc.arduino.packages;
import cc.arduino.packages.uploaders.SSHUploader; import cc.arduino.packages.uploaders.SSHUploader;
import cc.arduino.packages.uploaders.SerialUploader; import cc.arduino.packages.uploaders.SerialUploader;
import cc.arduino.packages.uploaders.GenericNetworkUploader; import cc.arduino.packages.uploaders.GenericNetworkUploader;
import processing.app.debug.TargetBoard;
public class UploaderFactory { public class UploaderFactory {
public Uploader newUploader(TargetBoard board, BoardPort port, boolean noUploadPort) { public Uploader newUploader(BoardPort port, boolean noUploadPort) {
if (noUploadPort) { if (noUploadPort) {
return new SerialUploader(true); return new SerialUploader(true);
} }