details: https://code.openbravo.com/erp/devel/main/rev/3c7438e9bf3f changeset: 24226:3c7438e9bf3f user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Aug 08 16:49:37 2014 +0000 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/075ca846cedf changeset: 24227:075ca846cedf user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Aug 11 11:43:25 2014 +0200 summary: related to issue 27277: core changes to support new Google sign in New Google OAuth2 sign is implemented by an external module [1], this patch provides required infrastructure in order it to be implemented: - Sign In button in Login page can be modified by external modules - Some methods in LoginHandler are now accessible to be used by classes extending it [1] http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/sso/ForgeModuleDetail/Google-Sign-In details: https://code.openbravo.com/erp/devel/main/rev/5051c9b57bb4 changeset: 24228:5051c9b57bb4 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Aug 11 14:02:52 2014 +0200 summary: Fixes issue 27303: direct link filtered by FK column doesn't work The problem was that the identifier of the foreign key being filtered now is not stored in the criteria itself, because it is filtered using the id. To fix this, the chache with the map of fk-id, fk-identifiers of the filtered foreign keys is stored in the url, and then applied when the grid filter editor is available. details: https://code.openbravo.com/erp/devel/main/rev/1d904ddc173b changeset: 24229:1d904ddc173b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Aug 04 10:17:18 2014 +0200 summary: Fixes bug 27269: Compilation of modulescripts fails in APRM module details: https://code.openbravo.com/erp/devel/main/rev/e5b0c94de17e changeset: 24230:e5b0c94de17e user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Sun Jul 27 23:00:29 2014 +0200 summary: project junit-upgrade:Refactoring classes src-test. details: https://code.openbravo.com/erp/devel/main/rev/e54e5827e9b5 changeset: 24231:e54e5827e9b5 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Jul 28 13:17:23 2014 +0200 summary: project junit-upgrade:Refactoring some classes: execution order. details: https://code.openbravo.com/erp/devel/main/rev/1cdd36708614 changeset: 24232:1cdd36708614 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Tue Jul 29 12:19:10 2014 +0200 summary: project junit-upgrade:Added new hamcrest.jar and junit.jar details: https://code.openbravo.com/erp/devel/main/rev/6ced7b4eac48 changeset: 24233:6ced7b4eac48 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Wed Aug 06 12:44:16 2014 +0200 summary: project junit-upgrade:Some changes in classes src-test. details: https://code.openbravo.com/erp/devel/main/rev/175d5fa16caa changeset: 24234:175d5fa16caa user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Wed Aug 06 13:32:22 2014 +0200 summary: project junit-upgrade: Merge with pi. details: https://code.openbravo.com/erp/devel/main/rev/080963b7f253 changeset: 24235:080963b7f253 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Aug 08 10:43:31 2014 +0200 summary: project junit-upgrade: Add some changes in test of modules. details: https://code.openbravo.com/erp/devel/main/rev/ceaf97c541c3 changeset: 24236:ceaf97c541c3 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Aug 08 15:49:28 2014 +0200 summary: project junit-upgrade: Add last change in WeldBaseTest. details: https://code.openbravo.com/erp/devel/main/rev/ab253f1049e6 changeset: 24237:ab253f1049e6 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 12:59:03 2014 +0200 summary: project junit-upgrade: Remove some comments. details: https://code.openbravo.com/erp/devel/main/rev/8cc58d763eeb changeset: 24238:8cc58d763eeb user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 13:02:14 2014 +0200 summary: project junit-upgrade: Merge with pi details: https://code.openbravo.com/erp/devel/main/rev/0276fa6a664f changeset: 24239:0276fa6a664f user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 14:39:34 2014 +0200 summary: fixed issue 27290: upgrade junit 4.11. details: https://code.openbravo.com/erp/devel/main/rev/cf67ec7bec3c changeset: 24240:cf67ec7bec3c user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Aug 11 18:49:04 2014 +0200 summary: fixed issue 27308:fixed test case EntityXMLImportTestBusinessObject. details: https://code.openbravo.com/erp/devel/main/rev/ee7091c40efb changeset: 24241:ee7091c40efb user: Daniel Ruiz <daniel.ruiz <at> openbravo.com> date: Mon Aug 11 08:51:14 2014 +0200 summary: Fixes Issue 26718: Wrong credit/debit amounts when posting Doubtful debt doc details: https://code.openbravo.com/erp/devel/main/rev/aeabf2df2bf1 changeset: 24242:aeabf2df2bf1 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Aug 12 10:40:01 2014 +0200 summary: Fixes issue 27297: Bad behavior when a record is created with lazy filtering The problem was that the grid data, a ResultSet, was not being created until the first fetch call was done. If a record is created before the first fetch call, which is possible only using lazy filtering, then the record will not be shown in the grid until a fetch call is done, although it will be stored properly in the database. This also results in a wrong message being shown in the active subtab after saving the record. To fix this, and empty ResultSet is created when a new record is created if the grid does not have a ResultSet yet. details: https://code.openbravo.com/erp/devel/main/rev/681262a36913 changeset: 24243:681262a36913 user: Daniel Ruiz <daniel.ruiz <at> openbravo.com> date: Mon Aug 11 11:06:52 2014 +0200 summary: Fixes Issue 27298:Error reactivating payment if business partner field is blank details: https://code.openbravo.com/erp/devel/main/rev/f93c6f350902 changeset: 24244:f93c6f350902 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Aug 12 18:39:24 2014 +0000 summary: CI: update AD_MODULE to version 24243 diffstat: .classpath.template | 1 + legal/Licensing.txt | 5 +- lib/build/hamcrest-all-1.3.jar | 0 lib/build/junit.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java | 69 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java | 22 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java | 24 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java | 19 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java | 20 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_08.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_11.java | 21 +- modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java | 9 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateReconciliationStatementProcessedValueData.java | 46 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 84 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java | 8 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTest.java | 4 +- modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/StandardWindowTest.java | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 17 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 3 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/FreemarkerTemplateProcessorTest.java | 12 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 2 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java | 11 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/CompressionTest.java | 11 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java | 23 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/TemplateResolverTest.java | 22 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src-test/org/openbravo/client/myob/test/MyOpenbravoTest.java | 31 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src-test/org/openbravo/service/datasource/test/DataSourceServiceProviderTest.java | 6 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/DataQueryServiceTest.java | 20 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonConversionTest.java | 19 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonReadRestTest.java | 15 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonRestTest.java | 8 +- modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/JsonUpdateRestTest.java | 16 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src-test/org/openbravo/userinterface/selectors/test/ExpressionsTest.java | 28 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-test/org/openbravo/erpCommon/info/ClassicSelectorTest.java | 10 +- src-test/org/openbravo/test/AllAntTaskTests.java | 126 +- src-test/org/openbravo/test/AllQuickAntTaskTests.java | 88 +- src-test/org/openbravo/test/AllTests.java | 88 +- src-test/org/openbravo/test/AllWebserviceTests.java | 35 +- src-test/org/openbravo/test/AntTaskTests.java | 116 +- src-test/org/openbravo/test/accounting/RecordID2Test.java | 14 +- src-test/org/openbravo/test/ant/AntTasksTest.java | 10 +- src-test/org/openbravo/test/ant/BaseAntTest.java | 16 +- src-test/org/openbravo/test/ant/CallWadTest.java | 6 +- src-test/org/openbravo/test/ant/RestartTomcatTest.java | 6 +- src-test/org/openbravo/test/base/BaseTest.java | 11 +- src-test/org/openbravo/test/base/HiddenObjectHelper.java | 2 +- src-test/org/openbravo/test/base/OBBaseTest.java | 400 ++++++++++ src-test/org/openbravo/test/dal/ADCachedMultiThreadTest.java | 17 +- src-test/org/openbravo/test/dal/AdminContextTest.java | 14 +- src-test/org/openbravo/test/dal/ComputedColumnsTest.java | 13 +- src-test/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 14 +- src-test/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 11 +- src-test/org/openbravo/test/dal/DalConnectionProviderTest.java | 10 +- src-test/org/openbravo/test/dal/DalCopyTest.java | 13 +- src-test/org/openbravo/test/dal/DalFilterTest.java | 13 +- src-test/org/openbravo/test/dal/DalPerformanceCriteriaTest.java | 11 +- src-test/org/openbravo/test/dal/DalPerformanceExampleTest.java | 18 +- src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java | 24 +- src-test/org/openbravo/test/dal/DalPerformanceProductTest.java | 14 +- src-test/org/openbravo/test/dal/DalPerformanceProxyTest.java | 11 +- src-test/org/openbravo/test/dal/DalQueryTest.java | 69 +- src-test/org/openbravo/test/dal/DalStoredProcedureTest.java | 14 +- src-test/org/openbravo/test/dal/DalTest.java | 87 +- src-test/org/openbravo/test/dal/DalUtilTest.java | 14 +- src-test/org/openbravo/test/dal/DoOrgClientAccessCheckTest.java | 13 +- src-test/org/openbravo/test/dal/DynamicEntityTest.java | 39 +- src-test/org/openbravo/test/dal/HiddenUpdateTest.java | 8 +- src-test/org/openbravo/test/dal/IssuesTest.java | 59 +- src-test/org/openbravo/test/dal/MappingGenerationTest.java | 10 +- src-test/org/openbravo/test/dal/OBContextTest.java | 16 +- src-test/org/openbravo/test/dal/PerformanceGenerateInstanceTest.java | 10 +- src-test/org/openbravo/test/dal/ReadByNameTest.java | 46 +- src-test/org/openbravo/test/dal/SimpleDalReadTest.java | 10 +- src-test/org/openbravo/test/dal/ValidationTest.java | 19 +- src-test/org/openbravo/test/dal/ViewTest.java | 13 +- src-test/org/openbravo/test/datasource/BaseDataSourceTestDal.java | 6 +- src-test/org/openbravo/test/datasource/BaseDataSourceTestNoDal.java | 6 +- src-test/org/openbravo/test/datasource/FICTest.java | 6 +- src-test/org/openbravo/test/datasource/ProductSelectorDataSourceTest.java | 6 + src-test/org/openbravo/test/datasource/SelectorFieldPropertySelectorDSTest.java | 9 + src-test/org/openbravo/test/datasource/TestCSVEncoding.java | 6 +- src-test/org/openbravo/test/datasource/TestComboDatasource.java | 14 + src-test/org/openbravo/test/doc/GenerateEntityModelWiki.java | 9 +- src-test/org/openbravo/test/expression/EvaluationTest.java | 12 +- src-test/org/openbravo/test/javascript/CompressionTest.java | 4 +- src-test/org/openbravo/test/javascript/JavaScriptAPITest.java | 16 +- src-test/org/openbravo/test/mimetypes/MimeTypeTest.java | 8 +- src-test/org/openbravo/test/model/ClassLoaderTest.java | 10 +- src-test/org/openbravo/test/model/FieldProviderTest.java | 10 +- src-test/org/openbravo/test/model/IndexesTest.java | 10 +- src-test/org/openbravo/test/model/OneToManyTest.java | 36 +- src-test/org/openbravo/test/model/RuntimeModelTest.java | 37 +- src-test/org/openbravo/test/model/TrlColumnsOraTypeTest.java | 10 +- src-test/org/openbravo/test/model/UniqueConstraintTest.java | 12 +- src-test/org/openbravo/test/model/UtilsTest.java | 15 +- src-test/org/openbravo/test/modularity/DBPrefixTest.java | 61 +- src-test/org/openbravo/test/modularity/DatasetServiceTest.java | 11 +- src-test/org/openbravo/test/modularity/MergePropertiesTest.java | 16 +- src-test/org/openbravo/test/modularity/TableNameTest.java | 51 +- src-test/org/openbravo/test/preference/PreferenceTest.java | 99 +- src-test/org/openbravo/test/security/AccessLevelTest.java | 17 +- src-test/org/openbravo/test/security/AllDataAllowedOrganizationsTest.java | 8 +- src-test/org/openbravo/test/security/AllowedOrganizationsTest.java | 13 +- src-test/org/openbravo/test/security/EntityAccessTest.java | 54 +- src-test/org/openbravo/test/security/WritableReadableOrganizationClientTest.java | 15 +- src-test/org/openbravo/test/system/ErrorTextParserTest.java | 18 +- src-test/org/openbravo/test/system/OBPropertiesProviderTest.java | 10 +- src-test/org/openbravo/test/system/SystemServiceTest.java | 15 +- src-test/org/openbravo/test/system/SystemValidatorTest.java | 10 +- src-test/org/openbravo/test/webservice/BaseWSTest.java | 8 +- src-test/org/openbravo/test/webservice/PerformanceTest.java | 2 + src-test/org/openbravo/test/webservice/WSAddRecordWithComputedColumns.java | 5 + src-test/org/openbravo/test/webservice/WSReadTest.java | 10 +- src-test/org/openbravo/test/webservice/WSUpdateTest.java | 52 +- src-test/org/openbravo/test/xml/ClientExportImportTest.java | 21 +- src-test/org/openbravo/test/xml/DatasetExportTest.java | 15 +- src-test/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java | 73 +- src-test/org/openbravo/test/xml/EntityXMLImportTestReference.java | 43 +- src-test/org/openbravo/test/xml/EntityXMLImportTestSingle.java | 26 +- src-test/org/openbravo/test/xml/EntityXMLImportTestWarning.java | 15 +- src-test/org/openbravo/test/xml/EntityXMLIssues.java | 13 +- src-test/org/openbravo/test/xml/UniqueConstraintImportTest.java | 22 +- src-test/org/openbravo/test/xml/XMLBaseTest.java | 8 +- src/org/openbravo/base/secureApp/LoginHandler.java | 10 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 2 + src/org/openbravo/erpCommon/security/Login.java | 35 +- src/org/openbravo/erpCommon/security/SignInProvider.java | 39 + 179 files changed, 2283 insertions(+), 1244 deletions(-) diffs (truncated from 10848 to 300 lines): diff -r 4450016dee64 -r f93c6f350902 .classpath.template --- a/.classpath.template Fri Aug 08 16:30:22 2014 +0000 +++ b/.classpath.template Tue Aug 12 18:39:24 2014 +0000 @@ -30,5 +30,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/build/junit.jar"/> <classpathentry kind="lib" path="lib/build/js.jar"/> + <classpathentry kind="lib" path="lib/build/hamcrest-all-1.3.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff -r 4450016dee64 -r f93c6f350902 legal/Licensing.txt --- a/legal/Licensing.txt Fri Aug 08 16:30:22 2014 +0000 +++ b/legal/Licensing.txt Tue Aug 12 18:39:24 2014 +0000 @@ -157,7 +157,10 @@ Under the ANTLR license (available at http://www.antlr.org/license.html) # junit.jar -Under the CPL license (available at http://www.opensource.org/licenses/cpl1.0.php) +Under the Eclipse Public License - v 1.0 (available at https://www.eclipse.org/legal/epl-v10.html) + +# hamcrest-all-1.3.jar +Under the BSD 3-Clause license (avaliable at http://opensource.org/licenses/BSD-3-Clause) # js.jar # ob-rhino-1.6R7.jar diff -r 4450016dee64 -r f93c6f350902 lib/build/hamcrest-all-1.3.jar Binary file lib/build/hamcrest-all-1.3.jar has changed diff -r 4450016dee64 -r f93c6f350902 lib/build/junit.jar Binary file lib/build/junit.jar has changed diff -r 4450016dee64 -r f93c6f350902 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 08 16:30:22 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 12 18:39:24 2014 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24224]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24243]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 4450016dee64 -r f93c6f350902 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Aug 08 16:30:22 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Aug 12 18:39:24 2014 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24224]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24243]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24224]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24243]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 4450016dee64 -r f93c6f350902 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java Fri Aug 08 16:30:22 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java Tue Aug 12 18:39:24 2014 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -19,34 +19,47 @@ package org.openbravo.advpaymentmngt.test.draft; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.openbravo.advpaymentmngt.test.draft.FinancialAccountTest; +import org.openbravo.advpaymentmngt.test.draft.PaymentMethodTest; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_01; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_02; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_03; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_04; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_05; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_06; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_07; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_08; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_09; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_10; +import org.openbravo.advpaymentmngt.test.draft.PaymentTest_11; +/** + * + * Test for org.openbravo.advpaymentmngt + * + */ + +@RunWith(Suite.class) [email protected]({ + + // Master Data Configuration + FinancialAccountTest.class, // + PaymentMethodTest.class, + + // Payment scenarios + PaymentTest_01.class, // + PaymentTest_02.class, // + PaymentTest_03.class, // + PaymentTest_04.class, // + PaymentTest_05.class, // + PaymentTest_06.class, // + PaymentTest_07.class, // + PaymentTest_08.class, // + PaymentTest_09.class, // + PaymentTest_10.class, // + PaymentTest_11.class }) public class AllTests { - public static Test suite() { - final TestSuite suite = new TestSuite("Test for org.openbravo.advpaymentmngt"); - // $JUnit-BEGIN$ - - // Master Data Configuration - suite.addTestSuite(FinancialAccountTest.class); - suite.addTestSuite(PaymentMethodTest.class); - - // Payment scenarios - suite.addTestSuite(PaymentTest_01.class); - suite.addTestSuite(PaymentTest_02.class); - suite.addTestSuite(PaymentTest_03.class); - suite.addTestSuite(PaymentTest_04.class); - suite.addTestSuite(PaymentTest_05.class); - suite.addTestSuite(PaymentTest_06.class); - suite.addTestSuite(PaymentTest_07.class); - suite.addTestSuite(PaymentTest_08.class); - suite.addTestSuite(PaymentTest_09.class); - suite.addTestSuite(PaymentTest_10.class); - suite.addTestSuite(PaymentTest_11.class); - - // $JUnit-END$ - return suite; - } - } diff -r 4450016dee64 -r f93c6f350902 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java Fri Aug 08 16:30:22 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java Tue Aug 12 18:39:24 2014 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -23,26 +23,32 @@ import java.util.List; import org.hibernate.criterion.Restrictions; +import org.junit.Before; +import org.junit.Test; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.model.common.businesspartner.BusinessPartner; import org.openbravo.model.common.currency.Currency; import org.openbravo.model.common.geography.Location; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; -import org.openbravo.test.base.BaseTest; +import org.openbravo.test.base.OBBaseTest; -public class FinancialAccountTest extends BaseTest { +public class FinancialAccountTest extends OBBaseTest { private static final String BANK = "B"; private static final String CASH = "C"; private static final String STANDARD_DESCRIPTION = "JUnit Test"; - @Override - protected void setUp() throws Exception { - super.setUp(); + /** + * This before method is named setUpF() to avoid overwriting the super + * setUp method that is invoke automatically before this one. + */ + @Before + public void setUpF() throws Exception { TestUtility.setTestContext(); } + @Test public void testAddFinancialAccountValid1() { TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_1", STANDARD_DESCRIPTION, getOneInstance(Currency.class), CASH, false, getOneInstance(Location.class), @@ -51,6 +57,7 @@ } // Pre-requisite: at least one Matching Algorithm created + @Test public void testAddFinancialAccountValid2() { TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_2", STANDARD_DESCRIPTION, getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class), @@ -59,6 +66,7 @@ null/* getOneInstance(MatchingAlgorithm.class) */, true, false); } + @Test public void testAddFinancialAccountValid3() { TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_3", STANDARD_DESCRIPTION, getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class), @@ -69,6 +77,7 @@ /** * Currency is mandatory */ + @Test public void testAddFinancialAccountNotValid1() { TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_4", STANDARD_DESCRIPTION, null, BANK, false, getOneInstance(Location.class), getOneInstance(BusinessPartner.class), "2054", @@ -79,6 +88,7 @@ /** * Deletes all the Payment Methods created for testing */ + @Test public void testDeleteFinancialAccounts() { final OBCriteria<FIN_FinancialAccount> obCriteria = OBDal.getInstance().createCriteria( FIN_FinancialAccount.class); diff -r 4450016dee64 -r f93c6f350902 modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java --- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java Fri Aug 08 16:30:22 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java Tue Aug 12 18:39:24 2014 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -22,12 +22,14 @@ import java.util.List; import org.hibernate.criterion.Restrictions; +import org.junit.Before; +import org.junit.Test; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod; -import org.openbravo.test.base.BaseTest; +import org.openbravo.test.base.OBBaseTest; -public class PaymentMethodTest extends BaseTest { +public class PaymentMethodTest extends OBBaseTest { private static final String AUTOMATIC_EXECUTION = "A"; private static final String MANUAL_EXECUTION = "M"; @@ -37,12 +39,16 @@ private static final String DEPOSIT_ACCOUNT = "DEP"; private static final String STANDARD_DESCRIPTION = "JUnit Test"; - @Override - protected void setUp() throws Exception { - super.setUp(); + /** + * This before method is named setUpP() to avoid overwriting the super + * setUp method that is invoke automatically before this one. + */ + @Before + public void setUpP() throws Exception { TestUtility.setTestContext(); } + @Test public void testAddPaymentMethodValid1() { TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_1", STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false, IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, @@ -50,6 +56,7 @@ CLEARED_ACCOUNT, true, false); } + @Test public void testAddPaymentMethodValid2() { TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_2", STANDARD_DESCRIPTION, true, false, false, AUTOMATIC_EXECUTION, null, false, IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, @@ -57,12 +64,14 @@ WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, false); } + @Test public void testAddPaymentMethodValid3() { TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_3", STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false, null, null, null, true, false, false, MANUAL_EXECUTION, null, false, null, null, null, true, false); } + @Test ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
