From 96b7c5ec6b2d8fc75b8668650e6132418f79e028 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Tue, 12 May 2015 15:22:56 +0200
Subject: [PATCH] MacOSX: fixed some failing tests

---
 app/build.xml                                                   | 1 +
 app/test/processing/app/AbstractWithPreferencesTest.java        | 1 +
 .../packages/HostDependentDownloadableContribution.java         | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/build.xml b/app/build.xml
index 5f14148dd..4c20976b6 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -106,6 +106,7 @@
     <junit printsummary="yes" dir="${work.dir}" fork="true">
       <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
       <jvmarg value="-DWORK_DIR=."/>
+      <jvmarg value="-ea"/>
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
diff --git a/app/test/processing/app/AbstractWithPreferencesTest.java b/app/test/processing/app/AbstractWithPreferencesTest.java
index 4f176471d..7ee6e2195 100644
--- a/app/test/processing/app/AbstractWithPreferencesTest.java
+++ b/app/test/processing/app/AbstractWithPreferencesTest.java
@@ -38,6 +38,7 @@ public abstract class AbstractWithPreferencesTest {
   public void init() throws Exception {
     Runtime.getRuntime().addShutdownHook(new Thread(DeleteFilesOnShutdown.INSTANCE));
     Base.initPlatform();
+    Base.getPlatform().init();
     Preferences.init(null);
     Theme.init();
 
diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
index 1c99e1500..c9c7ec1b6 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
@@ -41,7 +41,9 @@ public abstract class HostDependentDownloadableContribution extends Downloadable
 
   public boolean isCompatible(Platform platform) {
     String osName = platform.getOsName();
+    assert osName != null;
     String osArch = platform.getOsArch();
+    assert osArch != null;
 
     String host = getHost();