rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Fixed UpdatableLibrarieyTest

Browse Source
This commit is contained in:
Cristian Maglie 2018-05-21 12:04:01 +02:00
parent 8dd9a3e999
commit 901d8c77fe
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/processing/app/Base.java
View File

@ -339,6 +339,7 @@ public class Base {
LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder()); LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder());
indexer.parseIndex(); indexer.parseIndex();
indexer.setLibrariesFolders(BaseNoGui.getLibrariesFolders()); indexer.setLibrariesFolders(BaseNoGui.getLibrariesFolders());
indexer.rescanLibraries();
for (String library : parser.getLibraryToInstall().split(",")) { for (String library : parser.getLibraryToInstall().split(",")) {
String[] libraryToInstallParts = library.split(":"); String[] libraryToInstallParts = library.split(":");

2
app/test/cc/arduino/contributions/UpdatableLibraryTest.java
View File

@ -37,6 +37,7 @@ public class UpdatableLibraryTest {
BaseNoGui.librariesIndexer = indexer; BaseNoGui.librariesIndexer = indexer;
indexer.parseIndex(); indexer.parseIndex();
indexer.setLibrariesFolders(folders); indexer.setLibrariesFolders(folders);
indexer.rescanLibraries();
ContributedLibrary sdLib = indexer.getIndex().getInstalled("SD").get(); ContributedLibrary sdLib = indexer.getIndex().getInstalled("SD").get();
assertTrue("SD lib is installed", sdLib.isLibraryInstalled()); assertTrue("SD lib is installed", sdLib.isLibraryInstalled());
@ -63,6 +64,7 @@ public class UpdatableLibraryTest {
BaseNoGui.librariesIndexer = indexer; BaseNoGui.librariesIndexer = indexer;
indexer.parseIndex(); indexer.parseIndex();
indexer.setLibrariesFolders(folders); indexer.setLibrariesFolders(folders);
indexer.rescanLibraries();
ContributedLibrary l = indexer.getIndex().getInstalled("Bridge").get(); ContributedLibrary l = indexer.getIndex().getInstalled("Bridge").get();
assertTrue("Bridge lib is installed", l.isLibraryInstalled()); assertTrue("Bridge lib is installed", l.isLibraryInstalled());

8
arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
View File

@ -113,7 +113,7 @@ public class LibrariesIndexer {
return librariesFolders; return librariesFolders;
} }
private UserLibraryPriorityComparator priorityComparator; private UserLibraryPriorityComparator priorityComparator = new UserLibraryPriorityComparator(null);
public void addToInstalledLibraries(UserLibrary lib) { public void addToInstalledLibraries(UserLibrary lib) {
UserLibrary toReplace = installedLibraries.getByName(lib.getName()); UserLibrary toReplace = installedLibraries.getByName(lib.getName());
@ -129,9 +129,11 @@ public class LibrariesIndexer {
installedLibraries.add(lib); installedLibraries.add(lib);
} }
public void rescanLibraries() { public void setArchitecturePriority(String arch) {
priorityComparator = new UserLibraryPriorityComparator(BaseNoGui.getTargetPlatform().getId()); priorityComparator = new UserLibraryPriorityComparator(arch);
}
public void rescanLibraries() {
// Clear all installed flags // Clear all installed flags
installedLibraries.clear(); installedLibraries.clear();

2
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -675,6 +675,8 @@ public class BaseNoGui {
// Libraries located in the latest folders on the list can override // Libraries located in the latest folders on the list can override
// other libraries with the same name. // other libraries with the same name.
librariesIndexer.setLibrariesFolders(librariesFolders); librariesIndexer.setLibrariesFolders(librariesFolders);
librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
librariesIndexer.rescanLibraries();
populateImportToLibraryTable(); populateImportToLibraryTable();
} }