From 38484eb58249677e0a033b4036fb091486e9fe04 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Mon, 26 Oct 2009 19:10:04 +0300 Subject: [PATCH] fix tests: do not throw exception on empty extension if in headless or unit-tests mode --- .../impl/stores/StateStorageManagerImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java index 36c993fe3527..30f4261ec00a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java @@ -16,6 +16,7 @@ package com.intellij.openapi.components.impl.stores; import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.components.*; import com.intellij.openapi.diagnostic.Logger; @@ -48,6 +49,13 @@ public abstract class StateStorageManagerImpl implements StateStorageManager, Di private static final Logger LOG = Logger.getInstance("#" + StateStorageManagerImpl.class.getName()); + private static final boolean ourHeadlessEnvironment; + + static { + final ApplicationEx ex = ApplicationManagerEx.getApplicationEx(); + ourHeadlessEnvironment = ex.isHeadlessEnvironment() || ex.isUnitTestMode(); + } + private final Map myMacros = new HashMap(); private final Map myStorages = new HashMap(); private final Map myPathToStorage = new HashMap(); @@ -269,7 +277,7 @@ public abstract class StateStorageManagerImpl implements StateStorageManager, Di } final String extension = FileUtil.getExtension(new File(expandedFile).getName()); - if (extension.length() == 0) { + if (!ourHeadlessEnvironment && extension.length() == 0) { throw new IllegalArgumentException("Extension is missing for storage file: " + expandedFile); }