@@ -46,13 +46,13 @@ describe('data access', () => {
46
46
47
47
beforeEach ( ( ) => {
48
48
sample . lines = [
49
- 'foo=bar' ,
49
+ ' foo0' ,
50
+ 'foo1=bar' ,
50
51
'foo2:bar2' ,
51
52
'foo3 bar3' ,
52
53
' foo4 bar4 ' ,
53
54
'foo5 = bar5' ,
54
55
'# foo6 = bar6' ,
55
- 'invalid_line' ,
56
56
' ! foo7 = bar7' ,
57
57
'foo8\\::bar8' ,
58
58
'foo9\\==bar9' ,
@@ -78,10 +78,11 @@ describe('data access', () => {
78
78
} )
79
79
80
80
const samplePairs = [
81
- [ 'foo' , 'bar' ] ,
81
+ [ 'foo0' , '' ] ,
82
+ [ 'foo1' , 'bar' ] ,
82
83
[ 'foo2' , 'bar2' ] ,
83
84
[ 'foo3' , 'bar3' ] ,
84
- [ 'foo4' , 'bar4' ] ,
85
+ [ 'foo4' , 'bar4 ' ] ,
85
86
[ 'foo5' , 'bar5' ] ,
86
87
[ 'foo8:' , 'bar8' ] ,
87
88
[ 'foo9=' , 'bar9' ] ,
@@ -101,35 +102,20 @@ describe('data access', () => {
101
102
[ 'foo23' , 'bar23' ]
102
103
]
103
104
104
- it . each ( [
105
- [ 'foo' , 'bar' ] ,
106
- [ 'foo2' , 'bar2' ] ,
107
- [ 'foo3' , 'bar3' ] ,
108
- [ 'foo4' , 'bar4' ] ,
109
- [ 'foo5' , 'bar5' ] ,
110
- [ 'foo6' , undefined ] ,
111
- [ 'foo7' , undefined ] ,
112
- [ 'foo8:' , 'bar8' ] ,
113
- [ 'foo9=' , 'bar9' ] ,
114
- [ 'foo10=' , 'bar10' ] ,
115
- [ 'foo11 ' , 'bar11' ] ,
116
- [ ' foo12' , 'bar12' ] ,
117
- [ '#foo13' , 'bar13' ] ,
118
- [ '!foo14#' , 'bar14' ] ,
119
- [ 'foo15' , '#bar15' ] ,
120
- [ 'foo16' , 'bar16' ] ,
121
- [ 'foo17' , 'bar17' ] ,
122
- [ 'f o o18' , ' bar18' ] ,
123
- [ 'foo19\n' , 'bar\t\f\r19\n' ] ,
124
- [ 'foo20' , '' ] ,
125
- [ 'foo21' , '' ] ,
126
- [ 'foo22' , '\\' ] ,
127
- [ 'foo23' , 'bar23' ]
128
- ] ) ( 'should get property "%s"' , ( key , expected ) => {
105
+ it . each ( samplePairs ) ( 'should get property "%s"' , ( key , expected ) => {
129
106
const result = properties . get ( sample , key )
130
107
expect ( result ) . toBe ( expected )
131
108
} )
132
109
110
+ it . each ( [
111
+ [ 'foo6' ] ,
112
+ [ 'foo7' ]
113
+ ] ) ( 'should not get commented property "%s"' , ( key ) => {
114
+ const result = properties . get ( sample , key )
115
+ expect ( result ) . toBeUndefined ( )
116
+ } )
117
+
118
+
133
119
it ( 'should return last value of duplicate key' , ( ) => {
134
120
const config : properties . Properties = {
135
121
lines : [
@@ -144,7 +130,7 @@ describe('data access', () => {
144
130
} )
145
131
146
132
it . each ( [
147
- [ 'foo ' , 'bar' , 'foo =bar' ] ,
133
+ [ 'foo1 ' , 'bar' , 'foo1 =bar' ] ,
148
134
[ 'foo8:' , 'bar8' , 'foo8\\:=bar8' ] ,
149
135
[ 'foo9=' , 'bar9' , 'foo9\\==bar9' ] ,
150
136
[ 'foo10=' , 'bar10' , 'foo10\\==bar10' ] ,
@@ -180,7 +166,8 @@ describe('data access', () => {
180
166
181
167
it ( 'should replace key pairs' , ( ) => {
182
168
const keys = [
183
- 'foo' ,
169
+ 'foo0' ,
170
+ 'foo1' ,
184
171
'foo2' ,
185
172
'foo3' ,
186
173
'foo4' ,
@@ -206,7 +193,8 @@ describe('data access', () => {
206
193
keys . forEach ( key => properties . set ( sample , key , 'x' ) )
207
194
208
195
expect ( sample . lines ) . toEqual ( [
209
- 'foo=x' ,
196
+ 'foo0=x' ,
197
+ 'foo1=x' ,
210
198
'foo2:x' ,
211
199
'foo3 x' ,
212
200
'foo4 x' ,
@@ -339,10 +327,10 @@ describe('data access', () => {
339
327
} )
340
328
341
329
it ( 'should parse test file' , async ( ) => {
342
- const contents = await fs . readFile ( '../fixtures/test-all.properties' , 'utf-8' )
330
+ const contents = await fs . readFile ( require . resolve ( '../fixtures/test-all.properties' ) , 'utf-8' )
343
331
344
332
// Parse
345
- const result = properties . toMap ( properties . parse ( contents ) )
333
+ const result = properties . toObject ( properties . parse ( contents ) )
346
334
347
335
// Verify
348
336
expect ( result ) . toEqual ( {
0 commit comments