property sheet: Fix failing test

Change-Id: I21b9550cc12473554e3da61b1deda067961812eb

2 files changed, 8 insertions, 4 deletions

diff --git a/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java b/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java
index beb7a7b44ec..5e2acfa3bbc 100644
--- a/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java
+++ b/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java
@@ -20,6 +20,7 @@ import com.android.annotations.VisibleForTesting;
 import com.android.ide.common.rendering.api.ResourceValue;
 import com.android.ide.common.resources.ResourceResolver;
 import com.android.resources.ResourceType;
+import com.android.tools.idea.configurations.Configuration;
 import com.android.tools.idea.rendering.GutterIconCache;
 import com.android.tools.idea.rendering.ResourceHelper;
 import com.android.tools.idea.uibuilder.property.NlProperty;
@@ -89,7 +90,13 @@ public class NlDefaultRenderer extends NlAttributeRenderer implements NlProperty
       return getColorIcon(text);
     }
 
-    ResourceResolver resolver = property.getComponent().getModel().getConfiguration().getResourceResolver();
+    Configuration configuration = property.getComponent().getModel().getConfiguration();
+    //noinspection ConstantConditions
+    if (configuration == null) { // happens in unit test
+      return null;
+    }
+
+    ResourceResolver resolver = configuration.getResourceResolver();
     if (resolver == null) {
       return null;
     }
diff --git a/designer/testSrc/com/android/tools/idea/uibuilder/property/MockNlComponent.java b/designer/testSrc/com/android/tools/idea/uibuilder/property/MockNlComponent.java
index 5643d7ee4cb..e6ba781a763 100644
--- a/designer/testSrc/com/android/tools/idea/uibuilder/property/MockNlComponent.java
+++ b/designer/testSrc/com/android/tools/idea/uibuilder/property/MockNlComponent.java
@@ -16,13 +16,10 @@
 package com.android.tools.idea.uibuilder.property;
 
 import com.android.annotations.NonNull;
-import com.android.tools.idea.rendering.AttributeSnapshot;
 import com.android.tools.idea.uibuilder.model.NlComponent;
 import com.android.tools.idea.uibuilder.model.NlModel;
 import com.intellij.psi.xml.XmlTag;
 
-import java.util.List;
-
 import static org.mockito.Mockito.mock;
 
 public class MockNlComponent extends NlComponent {