From 4cdfa1f6c687d9af83bdaefa4d1380283eb6fc04 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 9 Sep 2011 13:35:01 +0200 Subject: [PATCH] MockProject to core-impl --- .../src/com/intellij/mock/MockProject.java | 44 +++------------ .../com/intellij/ide/ActivityMonitorTest.java | 5 +- .../src/com/intellij/mock/MockProjectEx.java | 56 +++++++++++++++++++ .../testFramework/ParsingTestCase.java | 4 +- .../testFramework/PlatformLiteFixture.java | 3 +- 5 files changed, 72 insertions(+), 40 deletions(-) rename platform/{testFramework => core-impl}/src/com/intellij/mock/MockProject.java (68%) create mode 100644 platform/testFramework/src/com/intellij/mock/MockProjectEx.java diff --git a/platform/testFramework/src/com/intellij/mock/MockProject.java b/platform/core-impl/src/com/intellij/mock/MockProject.java similarity index 68% rename from platform/testFramework/src/com/intellij/mock/MockProject.java rename to platform/core-impl/src/com/intellij/mock/MockProject.java index f5e91689d222..d24d6f5e0fe4 100644 --- a/platform/testFramework/src/com/intellij/mock/MockProject.java +++ b/platform/core-impl/src/com/intellij/mock/MockProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,18 +15,20 @@ */ package com.intellij.mock; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.impl.stores.IProjectStore; -import com.intellij.openapi.project.ex.ProjectEx; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.picocontainer.PicoContainer; -public class MockProject extends MockComponentManager implements ProjectEx { - public MockProject() { - super(ApplicationManager.getApplication() != null ? ApplicationManager.getApplication().getPicoContainer() : null); +/** + * @author yole + */ +public class MockProject extends MockComponentManager implements Project { + public MockProject(PicoContainer parent) { + super(parent); } @Override @@ -34,14 +36,6 @@ public class MockProject extends MockComponentManager implements ProjectEx { return false; } - @Override - public void setProjectName(@NotNull String name) { - } - - @Override - public void checkUnknownMacros(final boolean showDialog) { - } - @NotNull @Override public Condition getDisposed() { @@ -53,26 +47,6 @@ public class MockProject extends MockComponentManager implements ProjectEx { }; } - @Override - @NotNull - public IProjectStore getStateStore() { - return new MockProjectStore(); - } - - @Override - public void init() { - } - - @Override - public boolean isOptimiseTestLoadSpeed() { - return false; - } - - @Override - public void setOptimiseTestLoadSpeed(final boolean optimiseTestLoadSpeed) { - throw new UnsupportedOperationException("Method setOptimiseTestLoadSpeed not implemented in " + getClass()); - } - @Override public boolean isOpen() { return false; diff --git a/platform/platform-impl/testSrc/com/intellij/ide/ActivityMonitorTest.java b/platform/platform-impl/testSrc/com/intellij/ide/ActivityMonitorTest.java index a6fd9f50d044..1dec199a9284 100644 --- a/platform/platform-impl/testSrc/com/intellij/ide/ActivityMonitorTest.java +++ b/platform/platform-impl/testSrc/com/intellij/ide/ActivityMonitorTest.java @@ -16,6 +16,7 @@ package com.intellij.ide; import com.intellij.mock.MockProject; +import com.intellij.mock.MockProjectEx; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.BusyObject; import junit.framework.TestCase; @@ -41,11 +42,11 @@ public class ActivityMonitorTest extends TestCase { public void testReady() { assertReady(null); - MockProject project1 = new MockProject(); + MockProjectEx project1 = new MockProjectEx(); assertReady(project1); assertFalse(myMonitor.hasObjectFor(project1)); - MockProject project2 = new MockProject(); + MockProjectEx project2 = new MockProjectEx(); assertReady(project2); assertFalse(myMonitor.hasObjectFor(project2)); diff --git a/platform/testFramework/src/com/intellij/mock/MockProjectEx.java b/platform/testFramework/src/com/intellij/mock/MockProjectEx.java new file mode 100644 index 000000000000..d99ac330c0f3 --- /dev/null +++ b/platform/testFramework/src/com/intellij/mock/MockProjectEx.java @@ -0,0 +1,56 @@ +/* + * Copyright 2000-2011 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.mock; + +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.impl.stores.IProjectStore; +import com.intellij.openapi.project.ex.ProjectEx; +import org.jetbrains.annotations.NotNull; + +public class MockProjectEx extends MockProject implements ProjectEx { + public MockProjectEx() { + super(ApplicationManager.getApplication() != null ? ApplicationManager.getApplication().getPicoContainer() : null); + } + + @Override + public void setProjectName(@NotNull String name) { + } + + @Override + public void checkUnknownMacros(final boolean showDialog) { + } + + @Override + @NotNull + public IProjectStore getStateStore() { + return new MockProjectStore(); + } + + @Override + public void init() { + } + + @Override + public boolean isOptimiseTestLoadSpeed() { + return false; + } + + @Override + public void setOptimiseTestLoadSpeed(final boolean optimiseTestLoadSpeed) { + throw new UnsupportedOperationException("Method setOptimiseTestLoadSpeed not implemented in " + getClass()); + } + + } diff --git a/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java b/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java index df6c8aae8134..024793422ec5 100644 --- a/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java @@ -85,7 +85,7 @@ public abstract class ParsingTestCase extends PlatformLiteFixture { public void verify(PicoContainer container) throws PicoIntrospectionException { } }); - myProject = disposeOnTearDown(new MockProject()); + myProject = disposeOnTearDown(new MockProjectEx()); myPsiManager = new MockPsiManager(myProject); myFileFactory = new PsiFileFactoryImpl(myPsiManager); final MutablePicoContainer appContainer = getApplication().getPicoContainer(); @@ -139,7 +139,7 @@ public abstract class ParsingTestCase extends PlatformLiteFixture { }); } - public MockProject getProject() { + public MockProjectEx getProject() { return myProject; } diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformLiteFixture.java b/platform/testFramework/src/com/intellij/testFramework/PlatformLiteFixture.java index 5be1f7b28b81..ab537c5ffb63 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformLiteFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformLiteFixture.java @@ -17,6 +17,7 @@ package com.intellij.testFramework; import com.intellij.mock.MockApplicationEx; import com.intellij.mock.MockProject; +import com.intellij.mock.MockProjectEx; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.extensions.ExtensionPoint; @@ -34,7 +35,7 @@ import java.lang.reflect.Modifier; * @author yole */ public abstract class PlatformLiteFixture extends UsefulTestCase { - protected MockProject myProject; + protected MockProjectEx myProject; @Override protected void setUp() throws Exception {