@@ -75,7 +75,6 @@ def write_android_xml(path, lines)
75
75
76
76
expected = [
77
77
'<string name="override-true" content_override="true">from app override-true</string>' ,
78
- '' , '' , # FIXME: Current implementation adds empty lines; we should get rid of those at some point
79
78
'<string name="override-false">from lib override-false</string>' ,
80
79
'<string name="override-missing">from lib override-missing</string>' ,
81
80
]
@@ -118,11 +117,9 @@ def write_android_xml(path, lines)
118
117
119
118
expected = [
120
119
'<string name="override-true" content_override="true">from app override-true</string>' ,
121
- '' , # FIXME: Current implementation adds empty lines; we should get rid of those at some point
122
- '<string name="lib1-key" a8c-src-lib="lib1-id">Key only present in lib1</string>' ,
123
120
'<string name="override-missing" a8c-src-lib="lib2-id">from lib2 override-missing</string>' ,
121
+ '<string name="lib1-key" a8c-src-lib="lib1-id">Key only present in lib1</string>' ,
124
122
'<string name="lib2-key" a8c-src-lib="lib2-id">Key only present in lib2</string>' ,
125
- '' , # FIXME: Current implementation adds empty lines; we should get rid of those at some point
126
123
]
127
124
expect ( File . read ( app_strings_path ) ) . to eq ( android_xml_with_lines ( expected ) )
128
125
end
@@ -212,9 +209,8 @@ def write_android_xml(path, lines)
212
209
213
210
expected = [
214
211
'<string name="override-true" content_override="true">from app override-true</string>' ,
215
- '' , # FIXME: Current implementation adds empty lines; we should get rid of those at some point
216
- '<string name="override-missing">from app override-missing</string>' ,
217
212
'<string name="override-false">from lib override-false</string>' ,
213
+ '<string name="override-missing">from app override-missing</string>' ,
218
214
]
219
215
expect ( File . read ( app_strings_path ) ) . to eq ( android_xml_with_lines ( expected ) )
220
216
end
0 commit comments