Fixed UpdatableLibrarieyTest

Author: cmaglie

app/src/processing/app/Base.java

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

app/test/cc/arduino/contributions/UpdatableLibraryTest.java

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

arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java

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

arduino-core/src/processing/app/BaseNoGui.java

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