Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb01b1f2

Browse files
author
d.kovalenko
committed
[FIX] Reader must be saving ColOffset instead ColNum in a model
ColNum == ColOffset + 1
1 parent487f273 commitb01b1f2

File tree

5 files changed

+31
-25
lines changed

5 files changed

+31
-25
lines changed

‎src/core/read_utils.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ def GetColNum(self) -> int:
5656
assertself.m_ColNum>=0
5757
returnself.m_ColNum
5858

59+
# --------------------------------------------------------------------
60+
defGetColOffset(self)->int:
61+
asserttype(self.m_ColNum)==int
62+
assertself.m_ColNum>0
63+
returnself.m_ColNum-1
64+
5965
# --------------------------------------------------------------------
6066
defStepBack(self):
6167
asserttype(self.m_Next)==int

‎src/implementation/v00/configuration_base.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3335,7 +3335,7 @@ def Helper__ProcessLineData(
33353335

33363336
iflen(fileLine)==0andReadUtils.IsValidSeqCh1(ch):
33373337
# Read sequence
3338-
sequenceOffset=lineReader.GetColNum()
3338+
sequenceOffset=lineReader.GetColOffset()
33393339
sequence=ch
33403340

33413341
whilech:=lineReader.ReadSymbol():
@@ -3377,9 +3377,9 @@ def Helper__ProcessLineData__Comment(
33773377
asserttype(lineReader)==ReadUtils__LineReader
33783378

33793379
commentText=""
3380-
commentOffset=lineReader.GetColNum()
3381-
ch:str
3380+
commentOffset=lineReader.GetColOffset()
33823381

3382+
ch:str
33833383
whilech:=lineReader.ReadSymbol():
33843384
ifReadUtils.IsEOL(ch):
33853385
break
@@ -3396,7 +3396,7 @@ def Helper__ProcessLineData__Include(
33963396
asserttype(fileLine)==PostgresConfigurationFileLine_Base
33973397
asserttype(lineReader)==ReadUtils__LineReader
33983398
asserttype(includeOffset)==int
3399-
assertincludeOffset>0
3399+
assertincludeOffset>=0
34003400

34013401
# find first quote
34023402
whileTrue:

‎tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadConfigurationFile/test_set001__common.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,27 @@ def test_001__comment_and_options(self, request: pytest.FixtureRequest):
129129
fileDataLines[0].m_Items[0].m_Element.m_Text
130130
=="It is a test configuration file"
131131
)
132-
assertfileDataLines[0].m_Items[0].m_Element.m_Offset==1
132+
assertfileDataLines[0].m_Items[0].m_Element.m_Offset==0
133133

134134
# LINE 1
135135
asserttype(fileDataLines[1].m_Items[0].m_Element)==PgCfgModel__OptionData
136136
assertfileDataLines[1].m_Items[0].m_Element.m_Name=="port"
137137
assertfileDataLines[1].m_Items[0].m_Element.m_Value==123
138-
assertfileDataLines[1].m_Items[0].m_Element.m_Offset==1
138+
assertfileDataLines[1].m_Items[0].m_Element.m_Offset==0
139139

140140
asserttype(fileDataLines[1].m_Items[1].m_Element)==PgCfgModel__CommentData
141141
assertfileDataLines[1].m_Items[1].m_Element.m_Text=="It is a port"
142-
assertfileDataLines[1].m_Items[1].m_Element.m_Offset==10
142+
assertfileDataLines[1].m_Items[1].m_Element.m_Offset==9
143143

144144
# LINE 3
145145
asserttype(fileDataLines[3].m_Items[0].m_Element)==PgCfgModel__OptionData
146146
assertfileDataLines[3].m_Items[0].m_Element.m_Name=="listen_addresses"
147147
assertfileDataLines[3].m_Items[0].m_Element.m_Value=="*"
148-
assertfileDataLines[3].m_Items[0].m_Element.m_Offset==1
148+
assertfileDataLines[3].m_Items[0].m_Element.m_Offset==0
149149

150150
asserttype(fileDataLines[3].m_Items[1].m_Element)==PgCfgModel__CommentData
151151
assertfileDataLines[3].m_Items[1].m_Element.m_Text=="addresses"
152-
assertfileDataLines[3].m_Items[1].m_Element.m_Offset==22
152+
assertfileDataLines[3].m_Items[1].m_Element.m_Offset==21
153153

154154
# --------------------------------------------------------------------
155155
deftest_002__two_files(self,request:pytest.FixtureRequest):

‎tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_101__comment(self, request: pytest.FixtureRequest):
9797
fileLineData0=file1.m_FileData.m_Lines[0]
9898
assertlen(fileLineData0.m_Items)==1
9999
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__CommentData
100-
assertfileLineData0.m_Items[0].m_Element.m_Offset==2
100+
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
101101
assertfileLineData0.m_Items[0].m_Element.m_Text==" comment "
102102

103103
# --------------------------------------------------------------------
@@ -121,13 +121,13 @@ def test_102__two_comments(self, request: pytest.FixtureRequest):
121121
fileLineData0=file1.m_FileData.m_Lines[0]
122122
assertlen(fileLineData0.m_Items)==1
123123
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__CommentData
124-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
124+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
125125
assertfileLineData0.m_Items[0].m_Element.m_Text=="comment1"
126126

127127
fileLineData1=file1.m_FileData.m_Lines[1]
128128
assertlen(fileLineData1.m_Items)==1
129129
asserttype(fileLineData1.m_Items[0].m_Element)==PgCfgModel__CommentData
130-
assertfileLineData1.m_Items[0].m_Element.m_Offset==5
130+
assertfileLineData1.m_Items[0].m_Element.m_Offset==4
131131
assertfileLineData1.m_Items[0].m_Element.m_Text=="comment2"
132132

133133
# --------------------------------------------------------------------
@@ -174,7 +174,7 @@ def test_201__option(self, request: pytest.FixtureRequest, data201__assign: str)
174174
fileLineData0=file1.m_FileData.m_Lines[0]
175175
assertlen(fileLineData0.m_Items)==1
176176
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
177-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
177+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
178178
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
179179
assertfileLineData0.m_Items[0].m_Element.m_Value==123
180180

@@ -199,7 +199,7 @@ def test_202__option(self, request: pytest.FixtureRequest):
199199
fileLineData0=file1.m_FileData.m_Lines[0]
200200
assertlen(fileLineData0.m_Items)==1
201201
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
202-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
202+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
203203
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
204204
assertfileLineData0.m_Items[0].m_Element.m_Value==234
205205

@@ -224,7 +224,7 @@ def test_203__option__without_assign(self, request: pytest.FixtureRequest):
224224
fileLineData0=file1.m_FileData.m_Lines[0]
225225
assertlen(fileLineData0.m_Items)==1
226226
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
227-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
227+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
228228
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
229229
assertfileLineData0.m_Items[0].m_Element.m_Value==234
230230

@@ -297,12 +297,12 @@ def test_211__option_with_comment(self, request: pytest.FixtureRequest):
297297
fileLineData0=file1.m_FileData.m_Lines[0]
298298
assertlen(fileLineData0.m_Items)==2
299299
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
300-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
300+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
301301
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
302302
assertfileLineData0.m_Items[0].m_Element.m_Value==123
303303

304304
asserttype(fileLineData0.m_Items[1].m_Element)==PgCfgModel__CommentData
305-
assertfileLineData0.m_Items[1].m_Element.m_Offset==10
305+
assertfileLineData0.m_Items[1].m_Element.m_Offset==9
306306
assertfileLineData0.m_Items[1].m_Element.m_Text=="comment"
307307

308308
# --------------------------------------------------------------------
@@ -326,12 +326,12 @@ def test_212__option_with_comment_immediate(self, request: pytest.FixtureRequest
326326
fileLineData0=file1.m_FileData.m_Lines[0]
327327
assertlen(fileLineData0.m_Items)==2
328328
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
329-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
329+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
330330
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
331331
assertfileLineData0.m_Items[0].m_Element.m_Value==123
332332

333333
asserttype(fileLineData0.m_Items[1].m_Element)==PgCfgModel__CommentData
334-
assertfileLineData0.m_Items[1].m_Element.m_Offset==9
334+
assertfileLineData0.m_Items[1].m_Element.m_Offset==8
335335
assertfileLineData0.m_Items[1].m_Element.m_Text=="comment "
336336

337337
# --------------------------------------------------------------------
@@ -355,7 +355,7 @@ def test_301__optionQ(self, request: pytest.FixtureRequest):
355355
fileLineData0=file1.m_FileData.m_Lines[0]
356356
assertlen(fileLineData0.m_Items)==1
357357
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
358-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
358+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
359359
assertfileLineData0.m_Items[0].m_Element.m_Name=="port"
360360
assertfileLineData0.m_Items[0].m_Element.m_Value==123
361361

@@ -383,7 +383,7 @@ def test_302__optionQ__empty(
383383
fileLineData0=file1.m_FileData.m_Lines[0]
384384
assertlen(fileLineData0.m_Items)==1
385385
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
386-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
386+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
387387
assertfileLineData0.m_Items[0].m_Element.m_Name=="listen_addresses"
388388
assertfileLineData0.m_Items[0].m_Element.m_Value==""
389389

@@ -408,7 +408,7 @@ def test_303__optionQ__two_quote(self, request: pytest.FixtureRequest):
408408
fileLineData0=file1.m_FileData.m_Lines[0]
409409
assertlen(fileLineData0.m_Items)==1
410410
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
411-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
411+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
412412
assertfileLineData0.m_Items[0].m_Element.m_Name=="listen_addresses"
413413
assertfileLineData0.m_Items[0].m_Element.m_Value=="'"
414414

@@ -459,7 +459,7 @@ def test_304__optionQ__escape(
459459
fileLineData0=file1.m_FileData.m_Lines[0]
460460
assertlen(fileLineData0.m_Items)==1
461461
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__OptionData
462-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
462+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
463463
assertfileLineData0.m_Items[0].m_Element.m_Name=="listen_addresses"
464464
assertfileLineData0.m_Items[0].m_Element.m_Value==endData304[2]
465465

@@ -585,7 +585,7 @@ def test_401__include(self, request: pytest.FixtureRequest):
585585
fileLineData0=file1.m_FileData.m_Lines[0]
586586
assertlen(fileLineData0.m_Items)==1
587587
asserttype(fileLineData0.m_Items[0].m_Element)==PgCfgModel__IncludeData
588-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
588+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
589589
assertfileLineData0.m_Items[0].m_Element.m_Path=="a.conf"
590590

591591
file_A=cfg.get_AllFiles().GetFileByName("a.conf")

‎tests/implementation/v00/configuration_std/Options/STD/generic/bool_option/test_set001__common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def test_101__parse_file_line(self, optionName: str):
379379
type(fileLineData0.m_Items[0].m_Element)
380380
==PgCfgModel__OptionData
381381
)
382-
assertfileLineData0.m_Items[0].m_Element.m_Offset==1
382+
assertfileLineData0.m_Items[0].m_Element.m_Offset==0
383383
assertfileLineData0.m_Items[0].m_Element.m_Name==optionName
384384
assert (
385385
fileLineData0.m_Items[0].m_Element.m_Value

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp