Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ClientOrdinaryApplication SmokeCommonModules #805

Merged
merged 1 commit into from
Nov 7, 2020
Merged

fix ClientOrdinaryApplication SmokeCommonModules #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/smoke/Tests_SmokeCommonModules/Tests_SmokeCommonModules/Ext/ObjectModule.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ Function CommonModule(CommonModuleName) Export
Result = New Structure;
Result.Insert("Global", False);
Result.Insert("ClientManagedApplication", False);
Result.Insert("ClientOrdinaryApplication", False);
Result.Insert("Server", False);
Result.Insert("ExternalConnection", False);
Result.Insert("ServerCall", False);
Expand Down
41 changes: 5 additions & 36 deletions tests/smoke/Tests_SmokeCommonModules/Tests_SmokeCommonModules/Forms/Form/Ext/Form/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,30 +777,7 @@ EndProcedure // RecursivelyLoadSmokeCommonModuleTestsFromSubsystem()
// * ArrayItem - String - part of string.
//
Function _StrSplit(Val String, Val Separator, IncludeBlank = True)
SplitResult = New Array;

If IsBlankString(String) Then
If IncludeBlank Then
SplitResult.Add(String);
EndIf;
Return SplitResult;
EndIf;

Position = Find(String, Separator);
While Position > 0 Do
Substring = Left(String, Position - 1);
If IncludeBlank Or Not IsBlankString(Substring) Then
SplitResult.Add(Substring);
EndIf;
String = Mid(String, Position + StrLen(Separator));
Position = Find(String, Separator);
EndDo;

If IncludeBlank Or Not IsBlankString(String) Then
SplitResult.Add(String);
EndIf;

Return SplitResult;
Return Object()._StrSplit(String, Separator, IncludeBlank);
EndFunction // _StrSplit()

&AtServer
Expand All @@ -820,18 +797,10 @@ Function _StrTemplate(Val Template, Val Value1, Val Value2 = Undefined,
Val Value6 = Undefined, Val Value7 = Undefined, Val Value8 = Undefined,
Val Value9 = Undefined, Val Value10 = Undefined)

Template = StrReplace(Template, "%1", String(Value1));
Template = StrReplace(Template, "%2", String(Value2));
Template = StrReplace(Template, "%3", String(Value3));
Template = StrReplace(Template, "%4", String(Value4));
Template = StrReplace(Template, "%5", String(Value5));
Template = StrReplace(Template, "%6", String(Value6));
Template = StrReplace(Template, "%7", String(Value7));
Template = StrReplace(Template, "%8", String(Value8));
Template = StrReplace(Template, "%9", String(Value9));
Template = StrReplace(Template, "%10", String(Value10));

Return Template;
Return Object()._StrTemplate(Template, Value1, Value2,
Value3, Value4, Value5,
Value6, Value7, Value8,
Value9, Value10);

EndFunction // _StrTemplate()

Expand Down