From 7dbee4217c1e65f9d5697dfc5e71f29ac0bfe27f Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 9 Sep 2010 14:07:38 +0400 Subject: [PATCH] SVN: svn authentication test to work on Unix as well (different defaults on different OSes) ++ --- .../idea/svn/SvnAuthenticationTest.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java index 56042f853165..593f4bb85dde 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java @@ -96,21 +96,28 @@ public class SvnAuthenticationTest extends PlatformTestCase { listener.addStep(new Trinity(ProviderType.persistent, url, Type.request)); listener.addStep(new Trinity(ProviderType.interactive, url, Type.request)); - listener.addStep(new Trinity(ProviderType.persistent, url, Type.save)); + if (SystemInfo.isWindows) { + listener.addStep(new Trinity(ProviderType.persistent, url, Type.save)); + } else { + listener.addStep(new Trinity(ProviderType.persistent, url, Type.without_pasword_save)); + } commonScheme(url, false, null); - Assert.assertEquals((SystemInfo.isWindows ? 3 : 2), listener.getCnt()); + Assert.assertEquals(3, listener.getCnt()); //long start = System.currentTimeMillis(); //waitListenerStep(start, listener, 3); listener.reset(); SvnConfiguration.RUNTIME_AUTH_CACHE.clear(); listener.addStep(new Trinity(ProviderType.persistent, url, Type.request)); - listener.addStep(new Trinity(ProviderType.interactive, url, Type.request)); + if (! SystemInfo.isWindows) { + listener.addStep(new Trinity(ProviderType.interactive, url, Type.request)); + listener.addStep(new Trinity(ProviderType.persistent, url, Type.without_pasword_save)); + } commonScheme(url, false, null); //start = System.currentTimeMillis(); //waitListenerStep(start, listener, 4); - Assert.assertEquals((SystemInfo.isWindows ? 1 : 2), listener.getCnt()); + Assert.assertEquals((SystemInfo.isWindows ? 1 : 3), listener.getCnt()); } catch (SVNException e) { exception[0] = e; @@ -121,16 +128,12 @@ public class SvnAuthenticationTest extends PlatformTestCase { Assert.assertTrue(result[0]); myTestInteraction.assertNothing(); - Assert.assertEquals((SystemInfo.isWindows ? 1 : 2), listener.getCnt()); + Assert.assertEquals((SystemInfo.isWindows ? 1 : 3), listener.getCnt()); listener.assertForAwt(); savedOnceListener.assertForAwt(); - if (SystemInfo.isWindows) { - savedOnceListener.assertSaved(url, ISVNAuthenticationManager.PASSWORD); - } else { - savedOnceListener.assertNotSaved(url, ISVNAuthenticationManager.PASSWORD); - } - + savedOnceListener.assertSaved(url, ISVNAuthenticationManager.PASSWORD); + if (exception[0] != null) { throw exception[0]; }