Author: doogie
Date: Sat Mar 21 23:25:15 2009 New Revision: 757079 URL: http://svn.apache.org/viewvc?rev=757079&view=rev Log: Fix purely empty whitespace lines, and remove trailing whitespace. Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestCaseBase.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java Sat Mar 21 23:25:15 2009 @@ -68,7 +68,7 @@ public void run(TestResult result) { result.startTest(this); - + try { URL entityXmlURL = FlexibleLocation.resolveLocation(entityXmlUrlString); GenericDelegator delegator = modelTestSuite.getDelegator(); @@ -92,7 +92,7 @@ } catch (Exception e) { result.addError(this, e); } - + result.endTest(this); } } 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?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -33,14 +33,14 @@ import org.w3c.dom.Element; /** - * Use this class in a JUnit test runner to prepare the TestSuite. + * Use this class in a JUnit test runner to prepare the TestSuite. */ public class JunitSuiteWrapper { public static final String module = JunitSuiteWrapper.class.getName(); - + protected List<ModelTestSuite> modelTestSuiteList = FastList.newInstance(); - + public JunitSuiteWrapper(String componentName, String suiteName, String testCase) { for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(componentName)) { ResourceHandler testSuiteResource = testSuiteInfo.createResourceHandler(); @@ -90,7 +90,7 @@ return testSuites; } - + public List<Test> getAllTestList() { List<Test> allTestList = FastList.newInstance(); @@ -99,7 +99,7 @@ allTestList.add(tst); } } - + return allTestList; } } Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ public static final String module = JythonTest.class.getName(); protected String scriptLocation; - + /** * @param modelTestSuite */ @@ -43,7 +43,7 @@ public void run(TestResult result) { // TODO Auto-generated method stub result.startTest(this); - + result.endTest(this); } } Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,33 +37,33 @@ import org.w3c.dom.Element; /** - * Use this class in a JUnit test runner to bootstrap the Test Suite runner. + * Use this class in a JUnit test runner to bootstrap the Test Suite runner. */ public class ModelTestSuite { public static final String module = ModelTestSuite.class.getName(); - + protected String suiteName; protected String delegatorName; protected String dispatcherName; - + protected GenericDelegator delegator; protected LocalDispatcher dispatcher; protected List<Test> testList = FastList.newInstance(); - + public ModelTestSuite(Element mainElement, String testCase) { this.suiteName = mainElement.getAttribute("suite-name"); this.delegatorName = mainElement.getAttribute("delegator-name"); if (UtilValidate.isEmpty(this.delegatorName)) this.delegatorName = "test"; - + this.dispatcherName = mainElement.getAttribute("dispatcher-name"); if (UtilValidate.isEmpty(this.dispatcherName)) this.dispatcherName = "test-dispatcher"; - + this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName); this.dispatcher = GenericDispatcher.getLocalDispatcher(this.dispatcherName, delegator); - + for (Element testCaseElement : UtilXml.childElementList(mainElement, UtilMisc.toSet("test-case", "test-group"))) { String caseName = testCaseElement.getAttribute("case-name"); String nodeName = testCaseElement.getNodeName(); @@ -118,19 +118,19 @@ } } - + String getSuiteName() { return this.suiteName; } - + GenericDelegator getDelegator() { return this.delegator; } - + LocalDispatcher getDispatcher() { return this.dispatcher; } - + List<Test> getTestList() { return testList; } Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java Sat Mar 21 23:25:15 2009 @@ -57,12 +57,12 @@ public void run(TestResult result) { result.startTest(this); - + LocalDispatcher dispatcher = modelTestSuite.getDispatcher(); try { - Map serviceResult = SimpleMethod.runSimpleService(methodLocation, methodName, dispatcher.getDispatchContext(), + Map serviceResult = SimpleMethod.runSimpleService(methodLocation, methodName, dispatcher.getDispatchContext(), UtilMisc.toMap("test", this, "testResult", result, "locale", Locale.getDefault())); // do something with the errorMessage Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestCaseBase.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestCaseBase.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestCaseBase.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestCaseBase.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -26,10 +26,10 @@ public abstract class TestCaseBase implements Test { public static final String module = TestCaseBase.class.getName(); - + protected ModelTestSuite modelTestSuite; protected String caseName; - + public TestCaseBase(String caseName, ModelTestSuite modelTestSuite) { this.modelTestSuite = modelTestSuite; this.caseName = caseName; Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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?rev=757079&r1=757078&r2=757079&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Sat Mar 21 23:25:15 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -134,7 +134,7 @@ // run the tests suite.run(results); test.setCounts(results.runCount(), results.failureCount(), results.errorCount()); - xml.endTestSuite(test); + xml.endTestSuite(test); // dispay the results Debug.log("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + @@ -174,7 +174,7 @@ return true; } - public void stop() throws ContainerException { + public void stop() throws ContainerException { } class JunitXmlListener extends XMLJUnitResultFormatter { @@ -182,7 +182,7 @@ Map<String, Long> startTimes = FastMap.newInstance(); public JunitXmlListener(OutputStream out) { - this.setOutput(out); + this.setOutput(out); } public void startTestSuite(JUnitTest suite) { |
Free forum by Nabble | Edit this page |