From: <ssk...@re...> - 2005-01-14 15:07:45
|
Author: sskracic Date: 2005-01-14 15:57:52 +0100 (Fri, 14 Jan 2005) New Revision: 180 Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java Log: s/PersistentComponentFactory/PersistentComponent/g Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -26,7 +26,7 @@ import com.arsdigita.formbuilder.PersistentOption; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Reference @@ -81,7 +81,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentCheckboxGroup checkBox = PersistentCheckboxGroup.create(m_checkBoxName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-01-14 14:57:52 UTC (rev 180) @@ -24,7 +24,7 @@ import com.arsdigita.dispatcher.TestUtils; // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // The interface of the reference class import com.arsdigita.bebop.Component; @@ -90,7 +90,7 @@ // Start with the primary use-case - PersistentComponentFactory pcf = createPrimaryPersistentFactory(); + PersistentComponent pcf = createPrimaryPersistentFactory(); if ( pcf == null ) { return; @@ -113,7 +113,7 @@ String testKey = (String)persistentIter.next(); logDebug("secondary use-case " + testKey + " started"); - runTest((PersistentComponentFactory)persistentMap.get(testKey), + runTest((PersistentComponent)persistentMap.get(testKey), (Component)referenceMapBefore.get(testKey), (Component)referenceMapAfter.get(testKey)); @@ -141,7 +141,7 @@ * comparison. We are also comparing the default values after resurrection. * I use serialization for default values. */ - private void runTest(PersistentComponentFactory persistentFactory, + private void runTest(PersistentComponent persistentFactory, Component referenceComponentBefore, Component referenceComponentAfter) { @@ -160,7 +160,7 @@ persistentFactory.save(); BigDecimal id = persistentFactory.getID(); persistentFactory = - (PersistentComponentFactory) + (PersistentComponent) FormBuilderUtil.instantiateObjectOneArg(persistentFactory.getClass().getName(), id); @@ -196,12 +196,12 @@ } /** - * Returns a PersistentComponentFactory setup in a standard way reflecting the + * Returns a PersistentComponent setup in a standard way reflecting the * primary use-case. Every test case needs to at least include this use-case. * The component created by this factory will be compared with the factory returned * by createPrimaryReferenceComponent() */ - protected abstract PersistentComponentFactory createPrimaryPersistentFactory(); + protected abstract PersistentComponent createPrimaryPersistentFactory(); /** * This method creates a new reference component and populates setup in a standard @@ -211,7 +211,7 @@ protected abstract Component createPrimaryReferenceComponent(); /** - * Returns a map with use-case names as keys and PersistentComponentFactory:s as values. + * Returns a map with use-case names as keys and PersistentComponent:s as values. * Each factory is populated with different * data that reflects a secondary use-case. The components created by these factories * will compared with the reference component in the same position in the list returned @@ -243,7 +243,7 @@ * does not have. Those should be checked (after the component has been * retrieved from the database) in this method. */ - protected void checkPersistenceAttributes(PersistentComponentFactory factory) { + protected void checkPersistenceAttributes(PersistentComponent factory) { // Intentionally empty to be optionally implemented by sub classes } Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -23,7 +23,7 @@ import com.arsdigita.formbuilder.PersistentDate; // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // Interfaces used by the base test case import com.arsdigita.bebop.Component; @@ -70,7 +70,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentDate factory = PersistentDate.create(m_htmlName); @@ -108,7 +108,7 @@ } /** - * Returns a map with use-case names as keys and PersistentComponentFactory:s as values. + * Returns a map with use-case names as keys and PersistentComponent:s as values. * Each factory is populated with different * data that reflects a secondary use-case. The components created by these factories * will compared with the reference component in the same position in the list returned Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -23,7 +23,7 @@ import com.arsdigita.formbuilder.PersistentFormSection; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Component factories used @@ -106,7 +106,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentFormSection factory = new PersistentFormSection(); setFormSectionData(factory); @@ -133,7 +133,7 @@ * does not have. Those should be checked (after the component has been * retrieved from the database) in this method. */ - protected void checkPersistenceAttributes(PersistentComponentFactory factory) { + protected void checkPersistenceAttributes(PersistentComponent factory) { PersistentFormSection formSectionFactory = (PersistentFormSection)factory; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -23,7 +23,7 @@ import com.arsdigita.formbuilder.PersistentForm; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Reference @@ -70,7 +70,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentForm persistentForm = PersistentForm.create(m_htmlName); @@ -110,7 +110,7 @@ * does not have. Those should be checked (after the component has been * retrieved from the database) in this method. */ - protected void checkPersistenceAttributes(PersistentComponentFactory factory) { + protected void checkPersistenceAttributes(PersistentComponent factory) { m_formSectionTest.checkPersistenceAttributes(factory); } Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -20,7 +20,7 @@ // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // The class that we are testing import com.arsdigita.formbuilder.PersistentLabel; @@ -59,7 +59,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentLabel factory = PersistentLabel.create(m_label); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -26,7 +26,7 @@ import com.arsdigita.formbuilder.PersistentOption; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Reference @@ -81,7 +81,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentMultipleSelect select = PersistentMultipleSelect.create(m_selectName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -20,7 +20,7 @@ // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // The class that we are testing import com.arsdigita.formbuilder.PersistentOption; @@ -60,7 +60,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentOption factory = PersistentOption.create(m_parameterValue, m_label); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -26,7 +26,7 @@ import com.arsdigita.formbuilder.PersistentOption; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Reference @@ -81,7 +81,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentRadioGroup radio = PersistentRadioGroup.create(m_radioName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -26,7 +26,7 @@ import com.arsdigita.formbuilder.PersistentOption; // Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; // Reference @@ -81,7 +81,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentSingleSelect select = PersistentSingleSelect.create(m_selectName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -23,7 +23,7 @@ import com.arsdigita.formbuilder.PersistentSubmit; // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; @@ -58,7 +58,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentSubmit factory = PersistentSubmit.create(m_htmlName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -23,7 +23,7 @@ import com.arsdigita.formbuilder.PersistentTextArea; // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // Interfaces used by the base test case import com.arsdigita.bebop.Component; @@ -68,7 +68,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentTextArea factory = PersistentTextArea.create(m_htmlName); Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java 2005-01-14 14:56:33 UTC (rev 179) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java 2005-01-14 14:57:52 UTC (rev 180) @@ -20,7 +20,7 @@ // Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponentFactory; +import com.arsdigita.formbuilder.PersistentComponent; // The class we are testing import com.arsdigita.formbuilder.PersistentTextField; @@ -68,7 +68,7 @@ /** * This method returns an instance of the appropriate factory. */ - protected PersistentComponentFactory createPrimaryPersistentFactory() { + protected PersistentComponent createPrimaryPersistentFactory() { PersistentTextField factory = PersistentTextField.create(m_htmlName); |