#1322 ESP32 ATO upload should be fine now

Also added 2 regression tests checking the upload pattern key

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

@@ -658,7 +658,7 @@ public IPath getReferencingLibraryPath() {
         return this.getreferencingPlatformPath().append(LIBRARY_PATH_SUFFIX);
     }
 
-    public String getUploadCommand(ICConfigurationDescription confdesc) {
+    public String getUploadPatternKey() {
         updateWhenDirty();
         String upLoadTool = getActualUploadTool();
         String action = UPLOAD;
@@ -667,14 +667,10 @@ public String getUploadCommand(ICConfigurationDescription confdesc) {
         }
         String networkPrefix = EMPTY;
         if (isNetworkUpload()) {
-            networkPrefix = DOT + NETWORK_PREFIX;
+            networkPrefix = NETWORK_PREFIX;
         }
-        String key = TOOLS + DOT + upLoadTool + DOT + action + networkPrefix + DOT + PATTERN;
-        String ret = Common.getBuildEnvironmentVariable(confdesc, key, EMPTY);
-        if (ret.isEmpty()) {
-            Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID, key + " : not found in the platform.txt file")); //$NON-NLS-1$
-        }
-        return ret;
+        return TOOLS + DOT + upLoadTool + DOT + action + DOT + networkPrefix + PATTERN;
+
     }
 
     public String getActualUploadTool() {

io.sloeber.core/src/io/sloeber/core/tools/uploaders/arduinoUploader.java

@@ -51,9 +51,11 @@ public boolean uploadUsingPreferences(IFile hexFile, BoardDescription boardDescr
         } else {
             uploadPort = ArduinoSerial.makeArduinoUploadready(highStream, this.myProject, mycConf, boardDescr);
         }
-
-        String command = boardDescr.getUploadCommand(mycConf);
-        if (command == null) {
+        String uploadRecipoeKey = boardDescr.getUploadPatternKey();
+        String command = Common.getBuildEnvironmentVariable(mycConf, uploadRecipoeKey, EMPTY);
+        if (command.isEmpty()) {
+            Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
+                    uploadRecipoeKey + " : not found in the platform.txt file")); //$NON-NLS-1$
             highStream.println(Messages.uploader_Failed_to_get_upload_recipe);
             return false;
         }

io.sloeber.tests/src/io/sloeber/core/RegressionTest.java

@@ -30,6 +30,7 @@
 import io.sloeber.core.api.Preferences;
 import io.sloeber.core.api.SloeberProject;
 import io.sloeber.providers.Arduino;
+import io.sloeber.providers.ESP32;
 import io.sloeber.providers.ESP8266;
 import io.sloeber.providers.MCUBoard;
 import io.sloeber.providers.Teensy;
@@ -52,14 +53,15 @@ public static void WaitForInstallerToFinish() {
 
     public static void installAdditionalBoards() {
 
-        String[] packageUrlsToAdd = { ESP8266.packageURL };
+        String[] packageUrlsToAdd = { ESP8266.packageURL, ESP32.packageURL };
         PackageManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
         if (reinstall_boards_and_libraries) {
             PackageManager.removeAllInstalledPlatforms();
         }
         ;
         // make sure the needed boards are available
         ESP8266.installLatest();
+        ESP32.installLatest();
         Arduino.installLatestAVRBoards();
 
         if (!MySystem.getTeensyPlatform().isEmpty()) {
@@ -567,4 +569,22 @@ static CompileDescription getBunkersCompileDescription() {
         inCompileDescription.setWarningLevel(false);
         return inCompileDescription;
     }
+
+    /**
+     * check to see whether upload recipe key is correct for a couple of boards that
+     * have failed in the past
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void uploadPattern() throws Exception {
+        BoardDescription boardDescriptor = Arduino.uno().getBoardDescriptor();
+        String recipeKey = boardDescriptor.getUploadPatternKey();
+        assertEquals("uno upload recipe key is wrong", "tools.avrdude.upload.pattern", recipeKey);
+        boardDescriptor = ESP32.esp32().getBoardDescriptor();
+        boardDescriptor.setUploadPort("host 10.10.10.10");
+        recipeKey = boardDescriptor.getUploadPatternKey();
+        assertEquals("ESP OTA upload recipe key is wrong", "tools.esptool_py.upload.network_pattern", recipeKey);
+
+    }
 }

io.sloeber.tests/src/io/sloeber/providers/ESP32.java

@@ -1,6 +1,6 @@
 package io.sloeber.providers;
 
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -10,7 +10,7 @@
 @SuppressWarnings("nls")
 public class ESP32 extends MCUBoard {
 	private static final String provider = "esp32";
-	private static final String architectureName = "esp23";
+    private static final String architectureName = "esp32";
     private static final String jsonFileName ="package_esp32_index.json";
     public static final String packageURL ="https://dl.espressif.com/dl/package_esp32_index.json";
     public static final String esp32ID ="esp32";