Author: jaz
Date: Tue Mar 27 12:56:52 2007 New Revision: 523053 URL: http://svn.apache.org/viewvc?view=rev&rev=523053 Log: added option for running just a single component's test suite; java -jar ofbiz.jar -test -component=[componentName] Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java?view=diff&rev=523053&r1=523052&r2=523053 ============================================================================== --- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java Tue Mar 27 12:56:52 2007 @@ -167,11 +167,17 @@ } public static List getAllTestSuiteInfos() { + return getAllTestSuiteInfos(null); + } + + public static List getAllTestSuiteInfos(String componentName) { List testSuiteInfos = FastList.newInstance(); Iterator i = getAllComponents().iterator(); while (i.hasNext()) { ComponentConfig cc = (ComponentConfig) i.next(); - testSuiteInfos.addAll(cc.getTestSuiteInfos()); + if (componentName == null || componentName.equals(cc.getComponentName())) { + testSuiteInfos.addAll(cc.getTestSuiteInfos()); + } } return testSuiteInfos; Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java?view=diff&rev=523053&r1=523052&r2=523053 ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java Tue Mar 27 12:56:52 2007 @@ -41,8 +41,8 @@ protected List modelTestSuiteList = FastList.newInstance(); - public JunitSuiteWrapper() { - List testSuiteInfoList = ComponentConfig.getAllTestSuiteInfos(); + public JunitSuiteWrapper(String componentName) { + List testSuiteInfoList = ComponentConfig.getAllTestSuiteInfos(componentName); Iterator testSuiteInfoIter = testSuiteInfoList.iterator(); while (testSuiteInfoIter.hasNext()) { ComponentConfig.TestSuiteInfo testSuiteInfo = (ComponentConfig.TestSuiteInfo) testSuiteInfoIter.next(); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?view=diff&rev=523053&r1=523052&r2=523053 ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Tue Mar 27 12:56:52 2007 @@ -35,19 +35,43 @@ public static final String module = TestRunContainer.class.getName(); protected TestResult results = null; protected String configFile = null; + protected String component = null; /** * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) */ public void init(String[] args, String configFile) { this.configFile = configFile; + if (args != null) { + for (int i = 0; i < args.length; i++) { + String argument = args[i]; + // arguments can prefix w/ a '-'. Just strip them off + if (argument.startsWith("-")) { + int subIdx = 1; + if (argument.startsWith("--")) { + subIdx = 2; + } + argument = argument.substring(subIdx); + } + + // parse the arguments + if (argument.indexOf("=") != -1) { + String argumentName = argument.substring(0, argument.indexOf("=")); + String argumentVal = argument.substring(argument.indexOf("=") + 1); + + if ("component".equalsIgnoreCase(argumentName)) { + this.component = argumentVal; + } + } + } + } } public boolean start() throws ContainerException { //ContainerConfig.Container jc = ContainerConfig.getContainer("junit-container", configFile); // get the tests to run - JunitSuiteWrapper jsWrapper = new JunitSuiteWrapper(); + JunitSuiteWrapper jsWrapper = new JunitSuiteWrapper(component); // load the tests into the suite TestSuite suite = new TestSuite(); |
Free forum by Nabble | Edit this page |