diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java')
| -rw-r--r-- | plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java index a849adb09c40..a3d99c33228c 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java @@ -119,14 +119,15 @@ public class JiraIntegrationTest extends TaskManagerTestCase { } } - public void testBasicAuthenticationDisabling() throws Exception { - assertTrue("Basic authentication should be enabled at first", myRepository.isUseHttpAuthentication()); - myRepository.findTask("PRJONE-1"); - assertFalse("Basic authentication should be disabled once JSESSIONID cookie was received", myRepository.isUseHttpAuthentication()); - HttpClient client = myRepository.getHttpClient(); - assertFalse(client.getParams().isAuthenticationPreemptive()); - assertNull(client.getState().getCredentials(AuthScope.ANY)); - } + // TODO move to on-Demand-specific tests + //public void testBasicAuthenticationDisabling() throws Exception { + // assertTrue("Basic authentication should be enabled at first", myRepository.isUseHttpAuthentication()); + // myRepository.findTask("PRJONE-1"); + // assertFalse("Basic authentication should be disabled once JSESSIONID cookie was received", myRepository.isUseHttpAuthentication()); + // HttpClient client = myRepository.getHttpClient(); + // assertFalse(client.getParams().isAuthenticationPreemptive()); + // assertNull(client.getState().getCredentials(AuthScope.ANY)); + //} public void testSetTaskState() throws Exception { changeStateAndCheck(JIRA_4_TEST_SERVER_URL, "PRJONE-8"); |