Attachment #26151 for bug #50032

View | Details | Raw Unified | Return to bug 50032
Collapse All | Expand All




package org.apache.jmeter.control;

import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.junit.stubs.TestSampler;
import org.apache.jmeter.samplers.Sampler;

public class TestIfController extends JMeterTestCase {
        public TestIfController(String name) {

//                      + sampler.getName());
//          }
        }
   
        public void testProcessingTrue() throws Exception {
            LoopController controller = new LoopController();
            controller.setLoops(2);
            controller.addTestElement(new TestSampler("Sample1"));
            IfController ifCont = new IfController("true==true");
            ifCont.setEvaluateAll(true);
            ifCont.addTestElement(new TestSampler("Sample2"));
            TestSampler sample3 = new TestSampler("Sample3");            
            ifCont.addTestElement(sample3);
            controller.addTestElement(ifCont);
                        
            String[] order = new String[] { "Sample1", "Sample2", "Sample3", 
                    "Sample1", "Sample2", "Sample3" };
            int counter = 0;
            controller.setRunningVersion(true);
            ifCont.setRunningVersion(true);
            
            Sampler sampler = null;
            while ((sampler = controller.next()) != null) {
                sampler.sample(null);
                assertEquals(order[counter], sampler.getName());
                counter++;
            }
            assertEquals(counter, 6);
        }
        
        /**
         * Test false return on sample3 (sample4 doesn't execute)
         * @throws Exception
         */
        public void testEvaluateAllChildrenWithoutSubController() throws Exception {
            LoopController controller = new LoopController();
            controller.setLoops(2);
            controller.addTestElement(new TestSampler("Sample1"));
            IfController ifCont = new IfController("true==true");
            ifCont.setEvaluateAll(true);
            controller.addTestElement(ifCont);
            
            ifCont.addTestElement(new TestSampler("Sample2"));
            TestSampler sample3 = new TestSampler("Sample3");            
            ifCont.addTestElement(sample3);
            TestSampler sample4 = new TestSampler("Sample4");
            ifCont.addTestElement(sample4);
            
            String[] order = new String[] { "Sample1", "Sample2", "Sample3", 
                    "Sample1", "Sample2", "Sample3" };
            int counter = 0;
            controller.setRunningVersion(true);
            ifCont.setRunningVersion(true);
            
            Sampler sampler = null;
            while ((sampler = controller.next()) != null) {
                sampler.sample(null);
                if (sampler.getName().equals("Sample3")) {
                    ifCont.setCondition("true==false");
                }
                assertEquals(order[counter], sampler.getName());
                counter++;
            }
            assertEquals(counter, 6);
        }
        
        /**
         * test 2 loops with a sub generic controller (sample4 doesn't execute)
         * @throws Exception
         */
        public void testEvaluateAllChildrenWithSubController() throws Exception {
            LoopController controller = new LoopController();
            controller.setLoops(2);
            controller.addTestElement(new TestSampler("Sample1"));
            IfController ifCont = new IfController("true==true");
            ifCont.setEvaluateAll(true);
            controller.addTestElement(ifCont);
            ifCont.addTestElement(new TestSampler("Sample2"));
            
            GenericController genericCont = new GenericController();
            TestSampler sample3 = new TestSampler("Sample3");            
            genericCont.addTestElement(sample3);
            TestSampler sample4 = new TestSampler("Sample4");
            genericCont.addTestElement(sample4);
            ifCont.addTestElement(genericCont);
            
            String[] order = new String[] { "Sample1", "Sample2", "Sample3", 
                    "Sample1", "Sample2", "Sample3" };
            int counter = 0;
            controller.setRunningVersion(true);
            ifCont.setRunningVersion(true);
            genericCont.setRunningVersion(true);

            Sampler sampler = null;
            while ((sampler = controller.next()) != null) {
                sampler.sample(null);
                if (sampler.getName().equals("Sample3")) {
                    ifCont.setCondition("true==false");
                }
                assertEquals(order[counter], sampler.getName());
                counter++;
            }
            assertEquals(counter, 6); 
        }
}




        return null;
    }

  /**
  * Called to re-initialize a index of controller's elements
  * (Bug 50032)
  * @return Sampler
  */
    public Sampler reInitializeSubController() {
        Sampler returnValue = null;
        try {
            TestElement currentElement = getCurrentElement();
            if (currentElement != null) {
                if (currentElement instanceof Sampler) {
                    returnValue = nextIsASampler((Sampler) currentElement);
                } else { // must be a controller
                    returnValue = nextIsAController((Controller) currentElement);
                    reInitializeSubController();
                }
            }
        } catch (NextIsNullException e) {
        }
        return returnValue;
    }
    
    /**
     * If the controller is done, remove it from the list,
     * otherwise increment to next entry in list.

Lines 169-174 Link Here

(-)src/core/org/apache/jmeter/control/IfController.java (+1 lines)
169	return super.next();	169	return super.next();
170	}	170	}
171	try {	171	try {
		172	super.reInitializeSubController(); // Bug 50032 - reinitialize current index element for all sub controller
172	return nextIsNull();	173	return nextIsNull();
173	} catch (NextIsNullException e1) {	174	} catch (NextIsNullException e1) {
174	return null;	175	return null;

Return to bug 50032

Lines 215-220 Link Here

(-)src/core/org/apache/jmeter/control/GenericController.java (+22 lines)
215	return null;	215	return null;
216	}	216	}
217		217
		218	/**
		219	* Called to re-initialize a index of controller's elements
		220	* (Bug 50032)
		221	* @return Sampler
		222	*/
		223	public Sampler reInitializeSubController() {
		224	Sampler returnValue = null;
		225	try {
		226	TestElement currentElement = getCurrentElement();
		227	if (currentElement != null) {
		228	if (currentElement instanceof Sampler) {
		229	returnValue = nextIsASampler((Sampler) currentElement);
		230	} else { // must be a controller
		231	returnValue = nextIsAController((Controller) currentElement);
		232	reInitializeSubController();
		233	}
		234	}
		235	} catch (NextIsNullException e) {
		236	}
		237	return returnValue;
		238	}
		239
218	/**	240	/**
219	* If the controller is done, remove it from the list,	241	* If the controller is done, remove it from the list,
220	* otherwise increment to next entry in list.	242	* otherwise increment to next entry in list.

Lines 19-25 Link Here

(-)test/src/org/apache/jmeter/control/TestIfController.java (-1 / +103 lines)
19	package org.apache.jmeter.control;	19	package org.apache.jmeter.control;
20		20
21	import org.apache.jmeter.junit.JMeterTestCase;	21	import org.apache.jmeter.junit.JMeterTestCase;
22	//import org.apache.jmeter.testelement.TestElement;	22	import org.apache.jmeter.junit.stubs.TestSampler;
		23	import org.apache.jmeter.samplers.Sampler;
23		24
24	public class TestIfController extends JMeterTestCase {	25	public class TestIfController extends JMeterTestCase {
25	public TestIfController(String name) {	26	public TestIfController(String name) {
Lines 71-74 Link Here
71	// + sampler.getName());	72	// + sampler.getName());
72	// }	73	// }
73	}	74	}
		75
		76	public void testProcessingTrue() throws Exception {
		77	LoopController controller = new LoopController();
		78	controller.setLoops(2);
		79	controller.addTestElement(new TestSampler("Sample1"));
		80	IfController ifCont = new IfController("true==true");
		81	ifCont.setEvaluateAll(true);
		82	ifCont.addTestElement(new TestSampler("Sample2"));
		83	TestSampler sample3 = new TestSampler("Sample3");
		84	ifCont.addTestElement(sample3);
		85	controller.addTestElement(ifCont);
		86
		87	String[] order = new String[] { "Sample1", "Sample2", "Sample3",
		88	"Sample1", "Sample2", "Sample3" };
		89	int counter = 0;
		90	controller.setRunningVersion(true);
		91	ifCont.setRunningVersion(true);
		92
		93	Sampler sampler = null;
		94	while ((sampler = controller.next()) != null) {
		95	sampler.sample(null);
		96	assertEquals(order[counter], sampler.getName());
		97	counter++;
		98	}
		99	assertEquals(counter, 6);
		100	}
		101
		102	/**
		103	* Test false return on sample3 (sample4 doesn't execute)
		104	* @throws Exception
		105	*/
		106	public void testEvaluateAllChildrenWithoutSubController() throws Exception {
		107	LoopController controller = new LoopController();
		108	controller.setLoops(2);
		109	controller.addTestElement(new TestSampler("Sample1"));
		110	IfController ifCont = new IfController("true==true");
		111	ifCont.setEvaluateAll(true);
		112	controller.addTestElement(ifCont);
		113
		114	ifCont.addTestElement(new TestSampler("Sample2"));
		115	TestSampler sample3 = new TestSampler("Sample3");
		116	ifCont.addTestElement(sample3);
		117	TestSampler sample4 = new TestSampler("Sample4");
		118	ifCont.addTestElement(sample4);
		119
		120	String[] order = new String[] { "Sample1", "Sample2", "Sample3",
		121	"Sample1", "Sample2", "Sample3" };
		122	int counter = 0;
		123	controller.setRunningVersion(true);
		124	ifCont.setRunningVersion(true);
		125
		126	Sampler sampler = null;
		127	while ((sampler = controller.next()) != null) {
		128	sampler.sample(null);
		129	if (sampler.getName().equals("Sample3")) {
		130	ifCont.setCondition("true==false");
		131	}
		132	assertEquals(order[counter], sampler.getName());
		133	counter++;
		134	}
		135	assertEquals(counter, 6);
		136	}
		137
		138	/**
139	* test 2 loops with a sub generic controller (sample4 doesn't execute)
140	* @throws Exception
141	*/
142	public void testEvaluateAllChildrenWithSubController() throws Exception {
143	LoopController controller = new LoopController();
144	controller.setLoops(2);
145	controller.addTestElement(new TestSampler("Sample1"));
146	IfController ifCont = new IfController("true==true");
147	ifCont.setEvaluateAll(true);
148	controller.addTestElement(ifCont);
149	ifCont.addTestElement(new TestSampler("Sample2"));
150
151	GenericController genericCont = new GenericController();
152	TestSampler sample3 = new TestSampler("Sample3");
153	genericCont.addTestElement(sample3);
154	TestSampler sample4 = new TestSampler("Sample4");
155	genericCont.addTestElement(sample4);
156	ifCont.addTestElement(genericCont);
157
158	String[] order = new String[] { "Sample1", "Sample2", "Sample3",
159	"Sample1", "Sample2", "Sample3" };
160	int counter = 0;
161	controller.setRunningVersion(true);
162	ifCont.setRunningVersion(true);
163	genericCont.setRunningVersion(true);
164
165	Sampler sampler = null;
166	while ((sampler = controller.next()) != null) {
167	sampler.sample(null);
168	if (sampler.getName().equals("Sample3")) {
169	ifCont.setCondition("true==false");
170	}
171	assertEquals(order[counter], sampler.getName());
172	counter++;
173	}
174	assertEquals(counter, 6);
175	}
74	}	176	}