mstover1 02/03/05 19:51:36
Modified: src/org/apache/jmeter/gui/action Load.java
src/org/apache/jmeter/protocol/http/modifier
AnchorModifier.java
src/org/apache/jmeter/protocol/http/proxy Proxy.java
ProxyControl.java
src/org/apache/jmeter/save/handlers ThreadGroupHandler.java
Log:
Fixing bug loading saved ThreadGroup objects (introduced with internationalization)
Fixing Proxy ability to record more intelligently.
Revision Changes Path
1.14 +12 -6 jakarta-jmeter/src/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Load.java 20 Feb 2002 01:35:32 -0000 1.13
+++ Load.java 6 Mar 2002 03:51:35 -0000 1.14
@@ -80,7 +80,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/02/20 01:35:32 $
+ *@created $Date: 2002/03/06 03:51:35 $
*@version 1.0
***********************************************************/
public class Load implements Command
@@ -193,12 +193,12 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/02/20 01:35:32 $
- *@version $Revision: 1.13 $
+ *@created $Date: 2002/03/06 03:51:35 $
+ *@version $Revision: 1.14 $
***********************************************************/
public static class Test extends TestCase
{
- File testFile1, testFile2;
+ File testFile1, testFile2,testFile3;
static Load loader = new Load();
public Test(String name)
@@ -213,6 +213,7 @@
{
testFile1 = new File(System.getProperty("user.dir") +
"/bin/testfiles", "Test Plan.jmx");
testFile2 = new File(System.getProperty("user.dir") +
"/bin/testfiles", "Modification Manager.jmx");
+ testFile3 = new File(System.getProperty("user.dir") +
"/bin/testfiles", "proxy.jmx");
}
/************************************************************
@@ -224,9 +225,14 @@
{
ListedHashTree tree = getTree(testFile2);
loader.updateTree(tree);
- System.out.println(tree.list().get(0));
- System.out.println(tree.list(tree.list().get(0)).get(0));
assertTrue(tree.list(tree.list().get(0)).get(0) instanceof
LogicController);
+ }
+
+ public void testFile3() throws Exception
+ {
+ ListedHashTree tree = getTree(testFile3);
+ loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof
org.apache.jmeter.threads.ThreadGroup);
}
private ListedHashTree getTree(File f)
1.14 +5 -1
jakarta-jmeter/src/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Index: AnchorModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AnchorModifier.java 23 Feb 2002 01:21:07 -0000 1.13
+++ AnchorModifier.java 6 Mar 2002 03:51:35 -0000 1.14
@@ -80,7 +80,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/02/23 01:21:07 $
+ *@created $Date: 2002/03/06 03:51:35 $
*@version 1.0
***********************************************************/
@@ -153,6 +153,10 @@
***********************************************************/
public boolean modifyEntry(Entry entry, SampleResult result)
{
+ if(result == null)
+ {
+ return false;
+ }
List potentialLinks = new ArrayList();
String responseText = new
String((byte[])result.getValue(SampleResult.TEXT_RESPONSE));
UrlConfig config = (UrlConfig)entry.getConfigElement(UrlConfig.class);
1.12 +1 -1
jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java
Index: Proxy.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Proxy.java 4 Mar 2002 23:08:54 -0000 1.11
+++ Proxy.java 6 Mar 2002 03:51:36 -0000 1.12
@@ -150,10 +150,10 @@
{
request.parse(new
BufferedInputStream(ClientSocket.getInputStream()));
Entry entry = request.getEntry(urlConfig);
-
target.deliverUrlConfig((UrlConfig)entry.getConfigElement(UrlConfig.class));
entry.addConfigElement(cookieManager);
writeFromInToOut(new BufferedInputStream(new
ByteArrayInputStream(sampleServer(entry))),
new
BufferedOutputStream(ClientSocket.getOutputStream()));
+
target.deliverUrlConfig((UrlConfig)entry.getConfigElement(UrlConfig.class));
}
catch (UnknownHostException uhe)
{
1.12 +13 -5
jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProxyControl.java 23 Feb 2002 01:21:07 -0000 1.11
+++ ProxyControl.java 6 Mar 2002 03:51:36 -0000 1.12
@@ -78,7 +78,7 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2002/02/23 01:21:07 $
+ *@created $Date: 2002/03/06 03:51:36 $
*@version 1.0
***********************************************************/
@@ -328,16 +328,24 @@
}
}
}
- if(urlConfig == null || (urlConfig.getDomain().equals("") ||
+ System.out.println("urlConfig.getDomain =
"+urlConfig.getDomain());
+ System.out.println("config.getDomain = "+config.getDomain());
+ System.out.println("urlConfig.getPath = "+urlConfig.getPath());
+ System.out.println("config.getPath = "+config.getPath());
+ if(urlConfig == null || (urlConfig.getDomain() == null ||
+ urlConfig.getDomain().equals("") ||
urlConfig.getDomain().equals(config.getDomain())) &&
- (urlConfig.getPath().equals("") ||
+ (urlConfig.getPath() == null ||
+ urlConfig.getPath().equals("/") ||
urlConfig.getPath().equals(config.getPath())))
{
- if(urlConfig != null &&
!urlConfig.getDomain().equals(""))
+ if(urlConfig != null && urlConfig.getDomain() != null
&&
+ !urlConfig.getDomain().equals(""))
{
config.setDomain("");
}
- if(urlConfig != null &&
!urlConfig.getPath().equals(""))
+ if(urlConfig != null && urlConfig.getPath() != null &&
+ !urlConfig.getPath().equals("/"))
{
config.setPath("");
}
1.16 +2 -2
jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java
Index: ThreadGroupHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ThreadGroupHandler.java 4 Mar 2002 23:08:55 -0000 1.15
+++ ThreadGroupHandler.java 6 Mar 2002 03:51:36 -0000 1.16
@@ -69,7 +69,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/03/04 23:08:55 $
+ *@created $Date: 2002/03/06 03:51:36 $
*@version 1.0
***********************************************************/
@@ -114,7 +114,7 @@
***********************************************************/
public String getPrimaryTagName()
{
- return JMeterUtils.getResString("threadgroup");
+ return "ThreadGroup";
}
/************************************************************
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
