June 2014 - Wine-commits - list.winehq.org

Felix Janda : iphlpapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 0547c0d236ab197c14b5fec0abfad4c31eade7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0547c0d236ab197c14b5fec0a… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 iphlpapi: stdio.h needs to be included for sprintf(). --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e145386..8c55048 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h>

1 0

Zhenbo Li : mshtml: Added IHTMLDocument2:toString method.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 4719c438a9cd16c56ed2854de317bc7008aadc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4719c438a9cd16c56ed2854de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 31 19:51:07 2014 +0800 mshtml: Added IHTMLDocument2:toString method. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9db920..6992c93 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1578,8 +1578,17 @@ static HRESULT WINAPI HTMLDocument_get_onerrorupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; + } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb1e7be..c16e073 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5243,10 +5243,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; + BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), + "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::insertCell method implementation.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 48e41c4dd70243ced8412ae911722fdece37e923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e41c4dd70243ced8412ae91… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 26 22:12:50 2014 +0800 mshtml: Added IHTMLTableRow::insertCell method implementation. --- dlls/mshtml/htmltablerow.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 731b403..589a38f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -308,8 +308,27 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableRowElement_InsertCell(This->nsrow, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Cell at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableCell_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableCell failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c16e073..4eb02fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5737,10 +5737,22 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; + IDispatch *disp; + IUnknown *unk; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); test_tr_possess(elem, row, 1, "td2"); + + hres = IHTMLTableRow_insertCell(row, 0, &disp); + ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + if (SUCCEEDED(hres)) + IUnknown_Release(unk); + test_tr_possess(elem, row, 2, "td2"); + IDispatch_Release(disp); } static void test_tr_elem(IHTMLElement *elem)

1 0

Francois Gouget : testbot/web: Improve argument handling in the web methods.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 95b5ea0176af8ef17e4e262ce7e6cd31b7c80e6e URL: http://source.winehq.org/git/tools.git/?a=commit;h=95b5ea0176af8ef17e4e262c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:32 2014 +0200 testbot/web: Improve argument handling in the web methods. This standardizes the way we handle arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/web/Feedback.pl | 44 +++++++-------- testbot/web/ForgotPassword.pl | 29 +++++----- testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 76 ++++++++++++-------------- testbot/web/Login.pl | 36 ++++++------ testbot/web/Logout.pl | 12 ++-- testbot/web/PatchesList.pl | 41 ++++++-------- testbot/web/Register.pl | 48 ++++++++-------- testbot/web/ResetPassword.pl | 40 +++++++------- testbot/web/Screenshot.pl | 8 +-- testbot/web/Submit.pl | 106 +++++++++++++++++------------------- testbot/web/admin/BranchDetails.pl | 6 +- testbot/web/admin/BranchesList.pl | 11 ++-- testbot/web/admin/UserDetails.pl | 30 +++++----- testbot/web/admin/UsersList.pl | 30 +++++----- testbot/web/admin/VMDetails.pl | 13 ++--- testbot/web/admin/VMsList.pl | 24 ++++---- testbot/web/index.pl | 68 +++++++++++------------ 18 files changed, 299 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=95b5ea0176af8ef17e4e…

1 0

Francois Gouget : testbot/web: Use the default Domain and Path of our cookies.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 70ebd159c77017701d59d92f391a502e80bea2d3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=70ebd159c77017701d59d92f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:43:28 2014 +0200 testbot/web: Use the default Domain and Path of our cookies. The Path defaults to '/' which is what we want. The Domain is set to the most restrictive value which is good. This also means we're no longer putting the port number in the Domain value which fixes our cookies when the web server is running on a non-standard port or the connection is going through port forwarding. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index bfa44c4..a724507 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -162,8 +162,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -184,8 +182,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); }

1 0

Francois Gouget : testbot: Remove duplicate options from the sample Apache configuration file.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: b76db4ff3768eb5e9f5939fb0e0f915875b8dfb6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b76db4ff3768eb5e9f5939fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:47:53 2014 +0200 testbot: Remove duplicate options from the sample Apache configuration file. --- testbot/doc/vhost_winetestbot.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 3219bcd..5953317 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -22,8 +22,6 @@ PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders Options +ExecCGI - PerlOptions +ParseHeaders - Options +ExecCGI DirectoryIndex index.pl # Access control the Apache 2.2 way

1 0

Francois Gouget : testbot: Update the SSL Apache configuration section to match the regular one.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: bc4d58b448be3d2fbdb6cd5c180ac74467ae5af0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc4d58b448be3d2fbdb6cd5c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:48:03 2014 +0200 testbot: Update the SSL Apache configuration section to match the regular one. --- testbot/doc/vhost_winetestbot.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 5953317..7b84564 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -32,7 +32,7 @@ </Directory> </VirtualHost> -<VirtualHost 192.168.0.1:443> +<VirtualHost *:443> DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com @@ -42,8 +42,18 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key - PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(\&CreatePageBase); + </Perl> <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl @@ -52,7 +62,10 @@ Options +ExecCGI DirectoryIndex index.pl + # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>

1 0

Francois Gouget : testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 2a350500f2075a7da7c0b8337772ede3b94978d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a350500f2075a7da7c0b833… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:14:41 2014 +0200 testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope. Such checks belong to the higher levels. Doing them in LoadItem() interferes with Collection::Validate(), causing it to think new items are already present in the database whenever they don't have Sequence keys. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index c89fa64..06b139d 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -253,14 +253,24 @@ sub LoadCollection $Statement->finish(); } +=pod +=over 12 + +=item C<LoadItem()> + +Loads the specified Item from the database and adds it to the Collection. +By design this method will not check if the Item is already present in the +Collection scope. Such checks belong in the higher levels. This method will +however put the Item in the Collection's scope. + +=back +=cut + sub LoadItem { my $self = shift; my ($Collection, $RequestedKey) = @_; - my $Item = $Collection->GetScopeItem($RequestedKey); - return $Item if (defined $Item); - my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); my $Where = ""; @@ -283,7 +293,7 @@ sub LoadItem my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@Data); - $Item = undef; + my $Item; if (my $Row = $Statement->fetchrow_hashref()) { $Item = $Collection->CreateItem();

1 0

Francois Gouget : testbot/lib: Improve the Backend methods argument handling.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: 4ff885361b38d0cdfe024f6c9325539362872fa2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ff885361b38d0cdfe024f6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:14 2014 +0200 testbot/lib: Improve the Backend methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/BackEnd.pm | 8 ++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 82 +++++++++++++-------------------- 2 files changed, 38 insertions(+), 52 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index cf7439e..561bfce 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -35,17 +35,19 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(%ActiveBackEnds); -sub new +sub new($@) { my $class = shift; + my $self = {}; $self = bless $self, $class; - $self->_initialize(); + $self->_initialize(@_); return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 06b139d..45bd1f6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -40,9 +40,9 @@ require Exporter; @ISA = qw(ObjectModel::BackEnd Exporter); @EXPORT = qw(&UseDBIBackend); -sub GetDb +sub GetDb($) { - my $self = shift; + my ($self) = @_; if (defined $self->{Db} && !$self->{Db}->ping()) { @@ -58,10 +58,9 @@ sub GetDb return $self->{Db}; } -sub ToDb +sub ToDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -97,10 +96,9 @@ sub ToDb return $Value; } -sub FromDb +sub FromDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -129,10 +127,9 @@ sub FromDb return $Value; } -sub BuildKeyWhere +sub BuildKeyWhere($$$$) { - my $self = shift; - my ($PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -152,10 +149,9 @@ sub BuildKeyWhere return $Where; } -sub BuildFieldList +sub BuildFieldList($$) { - my $self = shift; - my $PropertyDescriptors = $_[0]; + my ($self, $PropertyDescriptors) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@$PropertyDescriptors) @@ -173,10 +169,9 @@ sub BuildFieldList return $Fields; } -sub LoadCollection +sub LoadCollection($$) { - my $self = shift; - my $Collection = $_[0]; + my ($self, $Collection) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -266,10 +261,9 @@ however put the Item in the Collection's scope. =back =cut -sub LoadItem +sub LoadItem($$$) { - my $self = shift; - my ($Collection, $RequestedKey) = @_; + my ($self, $Collection, $RequestedKey) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -314,10 +308,9 @@ sub LoadItem return $Item; } -sub BuildInsertStatement +sub BuildInsertStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; my $PlaceHolders = ""; @@ -352,11 +345,9 @@ sub BuildInsertStatement return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } -sub GetInsertData +sub GetInsertData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; if (defined($MasterColValues)) @@ -376,10 +367,9 @@ sub GetInsertData return \@Data; } -sub BuildUpdateStatement +sub BuildUpdateStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) @@ -407,11 +397,9 @@ sub BuildUpdateStatement return "UPDATE $TableName SET $Fields WHERE $Where"; } -sub GetUpdateData +sub GetUpdateData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -445,10 +433,9 @@ sub GetUpdateData return \@Data; } -sub SaveCollection +sub SaveCollection($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Db = $self->GetDb(); my ($MasterColNames, $MasterColValues) = $Collection->GetMasterCols(); @@ -500,10 +487,9 @@ sub SaveCollection $UpdateStatement->finish(); } -sub SaveItem +sub SaveItem($$) { - my $self = shift; - my $Item = $_[0]; + my ($self, $Item) = @_; my $Query; my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); @@ -528,10 +514,9 @@ sub SaveItem $Statement->finish(); } -sub DeleteItem +sub DeleteItem($$) { - my $self = shift; - my $Item = shift; + my ($self, $Item) = @_; my $Where = ""; my @Data; @@ -554,10 +539,9 @@ sub DeleteItem return undef; } -sub DeleteAll +sub DeleteAll($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Where = ""; my @Data; @@ -580,9 +564,9 @@ sub DeleteAll return undef; } -sub PrepareForFork +sub PrepareForFork($) { - my $self = shift; + my ($self) = @_; if (defined($self->{Db})) { @@ -591,7 +575,7 @@ sub PrepareForFork } } -sub UseDBIBackEnd +sub UseDBIBackEnd($$@) { my $class = shift; my $DbSelector = shift;

1 0

Francois Gouget : testbot/lib: Simplify and optimize Collection::Validate( ).
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: tools Branch: master Commit: f65fa587273a3130ec69f04a26f3ce1d17fe503d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f65fa587273a3130ec69f04a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:45 2014 +0200 testbot/lib: Simplify and optimize Collection::Validate(). --- testbot/lib/ObjectModel/Collection.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 7dbcf63..0070c57 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -409,18 +409,14 @@ sub Validate if ($Item->GetIsNew()) { my $HasSequenceKey = !1; - my $ErrProperty, my $ErrMessage; foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { - if ($PropertyDescriptor->GetIsKey()) + if ($PropertyDescriptor->GetIsKey() && + $PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "S") { - $ErrProperty = $PropertyDescriptor->GetName(); - $ErrMessage = $Item->$ErrProperty; - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "S") - { - $HasSequenceKey = 1; - } + $HasSequenceKey = 1; + last; } } if (! $HasSequenceKey)

1 0