diff options
Diffstat (limited to 'platform/platform-tests/testSrc/com/intellij/ide')
2 files changed, 3 insertions, 35 deletions
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java b/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java index 0e2355f5c3c1..a84497a8f083 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafeTest.java @@ -28,13 +28,13 @@ public class MasterKeyPasswordSafeTest { @Test public void testMasterKey() throws PasswordSafeException { PasswordDatabase db = new PasswordDatabase(); - MasterKeyPasswordSafe s1 = testProvider(db); + MasterKeyPasswordSafe s1 = new MasterKeyPasswordSafe(db); s1.resetMasterPassword("pass1", false); s1.storePassword(null, MasterKeyPasswordSafeTest.class, "TEST", "test"); assertEquals("test", s1.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST")); assertTrue(s1.changeMasterPassword("pass1", "pass2", false)); assertEquals("test", s1.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST")); - MasterKeyPasswordSafe s2 = testProvider(db); + MasterKeyPasswordSafe s2 = new MasterKeyPasswordSafe(db); assertFalse(s2.setMasterPassword("pass1")); assertTrue(s2.setMasterPassword("pass2")); assertEquals("test", s2.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST")); @@ -45,19 +45,4 @@ public class MasterKeyPasswordSafeTest { s2.resetMasterPassword("fail", false); assertNull(s2.getPassword(null, MasterKeyPasswordSafeTest.class, "TEST")); } - - /** - * Get test instance of the provider - * @param db the database to use - * @return a instance of the provider - */ - private static MasterKeyPasswordSafe testProvider(final PasswordDatabase db) { - return new MasterKeyPasswordSafe(db) { - @Override - protected boolean isTestMode() { - return true; - } - }; - } - } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java index 92b2ebad945c..99c6f5b5d25a 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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,7 +15,6 @@ */ package com.intellij.ide.util.treeView; -import com.intellij.openapi.diagnostic.Log; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Progressive; @@ -2753,22 +2752,6 @@ public class TreeUiTest extends AbstractTreeBuilderTest { return suite; } - @Override - protected void tearDown() throws Exception { - AbstractTreeUi ui = getBuilder().getUi(); - if (ui != null) { - ui.getReady(this).doWhenProcessed(new Runnable() { - @Override - public void run() { - Log.flush(); - } - }); - } else { - Log.flush(); - } - super.tearDown(); - } - private abstract static class MyRunnable implements Runnable { @Override public final void run() { |