@@ -1510,42 +1510,41 @@ func TestLibQueryParameters(t *testing.T) {
15101510 require .NoError (t , err )
15111511
15121512 // Check query=install when a library is installed
1513- stdout , _ , err := cli .Run ("lib" , "install" , "USBHost@1.0.0" , "-v" , "--log-level" , "debug" )
1513+ stdout , _ , err := cli .Run ("lib" , "install" , "USBHost@1.0.0" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
15141514 require .NoError (t , err )
1515- require .Contains (t , string (stdout ),
1516- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.0.zip?query=install\" \n " )
1515+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.0.zip?query=install"` )
15171516
15181517 // Check query=upgrade when a library is upgraded
1519- stdout , _ , err = cli .Run ("lib" , "upgrade" , "USBHost" , "-v" , "--log-level" , "debug" )
1518+ stdout , _ , err = cli .Run ("lib" , "upgrade" , "USBHost" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
15201519 require .NoError (t , err )
1521- require .Contains (t , string (stdout ),
1522- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.5.zip?query=upgrade\" \n " )
1520+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.5.zip?query=upgrade"` )
15231521
15241522 // Check query=depends when a library dependency is installed
1525- stdout , _ , err = cli .Run ("lib" , "install " , "MD_Parola@3.5.5" , "-v" , "--log-level " , "debug " )
1523+ stdout , _ , err = cli .Run ("lib" , "deps " , "MD_Parola@3.5.5" , "--format " , "json " )
15261524 require .NoError (t , err )
1527- require .Contains (t , string (stdout ),
1528- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/MajicDesigns/MD_MAX72XX-3.3.1.zip?query=depends\" \n " )
1525+ // determine the version installed as dependency
1526+ MDMAX72XXversion := strings .Trim (requirejson .Parse (t , stdout ).Query (`.dependencies[0].version_required` ).String (), `"` )
1527+
1528+ stdout , _ , err = cli .Run ("lib" , "install" , "MD_Parola@3.5.5" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
1529+ require .NoError (t , err )
1530+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/MajicDesigns/MD_MAX72XX-` + MDMAX72XXversion + `.zip?query=depends"` )
15291531
15301532 // Check query=download when a library is downloaded
1531- stdout , _ , err = cli .Run ("lib" , "download" , "WiFi101@0.16.1" , "-v" , "--log-level" , "debug" )
1533+ stdout , _ , err = cli .Run ("lib" , "download" , "WiFi101@0.16.1" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
15321534 require .NoError (t , err )
1533- require .Contains (t , string (stdout ),
1534- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/WiFi101-0.16.1.zip?query=download\" \n " )
1535+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/WiFi101-0.16.1.zip?query=download"` )
15351536
15361537 // Check query=install-builtin when a library dependency is installed in builtin-directory
15371538 cliEnv := cli .GetDefaultEnv ()
15381539 cliEnv ["ARDUINO_DIRECTORIES_BUILTIN_LIBRARIES" ] = cli .DataDir ().Join ("libraries" ).String ()
1539- stdout , _ , err = cli .RunWithCustomEnv (cliEnv , "lib" , "install" , "Firmata@2.5.3" , "--install-in-builtin-dir" , "-v" , "--log-level" , "debug" )
1540+ stdout , _ , err = cli .RunWithCustomEnv (cliEnv , "lib" , "install" , "Firmata@2.5.3" , "--install-in-builtin-dir" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
15401541 require .NoError (t , err )
1541- require .Contains (t , string (stdout ),
1542- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.3.zip?query=install-builtin\" \n " )
1542+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.3.zip?query=install-builtin` )
15431543
15441544 // Check query=update-builtin when a library dependency is updated in builtin-directory
1545- stdout , _ , err = cli .RunWithCustomEnv (cliEnv , "lib" , "install" , "Firmata@2.5.9" , "--install-in-builtin-dir" , "-v" , "--log-level" , "debug" )
1545+ stdout , _ , err = cli .RunWithCustomEnv (cliEnv , "lib" , "install" , "Firmata@2.5.9" , "--install-in-builtin-dir" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
15461546 require .NoError (t , err )
1547- require .Contains (t , string (stdout ),
1548- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.9.zip?query=upgrade-builtin\" \n " )
1547+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.9.zip?query=upgrade-builtin"` )
15491548}
15501549
15511550func TestLibBundlesWhenLibWithTheSameNameIsInstalledGlobally (t * testing.T ) {
0 commit comments