@@ -108,9 +108,14 @@ public void TestSetInfoNull(string endpointId)
108108 int infoAfterLibNameIndex = infoAfter ! . IndexOf ( "lib-name=" ) ;
109109 int infoBeforeLibNameIndex = infoBefore ! . IndexOf ( "lib-name=" ) ;
110110
111+ int infoAfterLibVerIndex = infoAfter . IndexOf ( " " , infoAfter ! . IndexOf ( "lib-ver=" ) ) ;
112+ infoAfterLibVerIndex = infoAfterLibVerIndex == - 1 ? infoAfter . Length : infoAfterLibVerIndex ;
113+ int infoBeforeLibVerIndex = infoBefore ! . IndexOf ( " " , infoBefore ! . IndexOf ( "lib-ver=" ) ) ;
114+ infoBeforeLibVerIndex = infoBeforeLibVerIndex == - 1 ? infoBefore . Length : infoBeforeLibVerIndex ;
115+
111116 // Extract the sub-strings starting from "lib-name="
112- string infoAfterLibNameToEnd = infoAfter . Substring ( infoAfterLibNameIndex ) ;
113- string infoBeforeLibNameToEnd = infoBefore . Substring ( infoBeforeLibNameIndex ) ;
117+ string infoAfterLibNameToEnd = infoAfter . Substring ( infoAfterLibNameIndex , infoAfterLibVerIndex - infoAfterLibNameIndex ) ;
118+ string infoBeforeLibNameToEnd = infoBefore . Substring ( infoBeforeLibNameIndex , infoBeforeLibVerIndex - infoBeforeLibNameIndex ) ;
114119
115120 // Assert that the extracted sub-strings are equal
116121 Assert . Equal ( infoAfterLibNameToEnd , infoBeforeLibNameToEnd ) ;
@@ -131,9 +136,14 @@ public async Task TestSetInfoNullAsync(string endpointId)
131136 int infoAfterLibNameIndex = infoAfter ! . IndexOf ( "lib-name=" ) ;
132137 int infoBeforeLibNameIndex = infoBefore ! . IndexOf ( "lib-name=" ) ;
133138
139+ int infoAfterLibVerIndex = infoAfter . IndexOf ( " " , infoAfter ! . IndexOf ( "lib-ver=" ) ) ;
140+ infoAfterLibVerIndex = infoAfterLibVerIndex == - 1 ? infoAfter . Length : infoAfterLibVerIndex ;
141+ int infoBeforeLibVerIndex = infoBefore . IndexOf ( " " , infoBefore ! . IndexOf ( "lib-ver=" ) ) ;
142+ infoBeforeLibVerIndex = infoBeforeLibVerIndex == - 1 ? infoBefore . Length : infoBeforeLibVerIndex ;
143+
134144 // Extract the sub-strings starting from "lib-name="
135- string infoAfterLibNameToEnd = infoAfter . Substring ( infoAfterLibNameIndex ) ;
136- string infoBeforeLibNameToEnd = infoBefore . Substring ( infoBeforeLibNameIndex ) ;
145+ string infoAfterLibNameToEnd = infoAfter . Substring ( infoAfterLibNameIndex , infoAfterLibVerIndex - infoAfterLibNameIndex ) ;
146+ string infoBeforeLibNameToEnd = infoBefore . Substring ( infoBeforeLibNameIndex , infoBeforeLibVerIndex - infoBeforeLibNameIndex ) ;
137147
138148 // Assert that the extracted sub-strings are equal
139149 Assert . Equal ( infoAfterLibNameToEnd , infoBeforeLibNameToEnd ) ;
0 commit comments