svn commit: r1732639 - in /jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control: TestCookieManager.java TestHC4CookieManager.java

[sebb]

Author: sebb
Date: Sat Feb 27 13:19:36 2016
New Revision: 1732639

URL: http://svn.apache.org/viewvc?rev=1732639&view=rev
Log:
Fix HC4CookieManager tests

Added:
    
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
      - copied, changed from r1732638, 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
Removed:
    
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java

Copied: 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
 (from r1732638, 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java)
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java?p2=jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java&p1=jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java&r1=1732638&r2=1732639&rev=1732639&view=diff
==============================================================================
--- 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java
 Sat Feb 27 13:19:36 2016
@@ -40,7 +40,10 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class TestCookieManager extends JMeterTestCase {
+/**
+ * HC4CookieHandler tests
+ */
+public class TestHC4CookieManager extends JMeterTestCase {
         private CookieManager man = null;
 
         private JMeterContext jmctx = null;
@@ -49,6 +52,9 @@ public class TestCookieManager extends J
         public void setUp() throws Exception {
             jmctx = JMeterContextService.getContext();
             man = new CookieManager();
+            // Ensure we use the new GUI defaults
+            man.setImplementation(HC4CookieHandler.class.getName());
+            man.setCookiePolicy(HC4CookieHandler.DEFAULT_POLICY_NAME);
             man.setThreadContext(jmctx);
             man.testStarted();// This is needed in order to set up the cookie 
policy
         }