@@ -58,7 +58,7 @@ void AssertAreEqualDefaultFPG(FPG fpg)
5858 Assert . AreEqual ( FPG_TEST_REGISTERS_COUNT , fpg . Count ) ;
5959
6060 for ( int i = 0 ; i < FPG_TEST_REGISTERS_COUNT ; i ++ )
61- AssertAreEqualDefaultRegisters ( fpg , i ) ;
61+ this . AssertAreEqualDefaultRegisters ( fpg , i ) ;
6262 }
6363
6464 void AssertAreEqualDefaultRegisters ( Register reg , MAP map , string filename )
@@ -82,7 +82,7 @@ void AssertAreEqualDefaultRegisters(FPG fpg, int index)
8282 int GetDefaultFPGSize ( )
8383 {
8484 int size = ColorPalette . SIZE + ColorRangeTable . SIZE ;
85- foreach ( var reg in this . _testFPGRegisters )
85+ foreach ( Register reg in this . _testFPGRegisters )
8686 size += FPG_REGISTER_BASE_SIZE + ( ControlPoint . SIZE * reg . controlPoints . Length ) + reg . BitmapLength ;
8787 return size ;
8888 }
@@ -215,7 +215,7 @@ public void ReadByIndex()
215215 {
216216 var fpg = new FPG ( this . GetAssetPath ( SharedConstants . FILENAME_FPG_TEST ) ) ;
217217 for ( int i = 0 ; i < FPG_TEST_REGISTERS_COUNT ; i ++ )
218- AssertAreEqualDefaultRegisters ( fpg , i ) ;
218+ this . AssertAreEqualDefaultRegisters ( fpg , i ) ;
219219 }
220220
221221 [ TestMethod ]
@@ -231,9 +231,9 @@ public void ReadByForEach()
231231 {
232232 int i = 0 ;
233233 var fpg = new FPG ( this . GetAssetPath ( SharedConstants . FILENAME_FPG_TEST ) ) ;
234- foreach ( var map in fpg )
234+ foreach ( MAP map in fpg )
235235 {
236- AssertAreEqualDefaultRegisters ( this . _testFPGRegisters [ i ] , map , fpg . GetFilename ( i ) ) ;
236+ this . AssertAreEqualDefaultRegisters ( this . _testFPGRegisters [ i ] , map , fpg . GetFilename ( i ) ) ;
237237 i ++ ;
238238 }
239239 }
@@ -259,6 +259,7 @@ public void AddMapWithTheSamePalette()
259259 public void AddMapWithDifferentPalette ( )
260260 {
261261 const string PLAYER_MAP_FILENAME_FIELD = "PLAYER.MAP" ;
262+
262263 string playerMapPath = this . GetAssetPath ( SharedConstants . FILENAME_IMG_PLAYER_MAP ) ;
263264
264265 var pal = new PAL ( this . GetAssetPath ( SharedConstants . FILENAME_PAL_DIV ) ) ;
@@ -325,6 +326,7 @@ public void FailContainsMap()
325326 public void RemoveMapByGraphId ( )
326327 {
327328 const int GRAPH_ID = 100 ; // PLAYER.MAP, index 1.
329+
328330 var fpg = new FPG ( this . GetAssetPath ( SharedConstants . FILENAME_FPG_TEST ) ) ;
329331
330332 fpg . Remove ( GRAPH_ID ) ;
@@ -392,6 +394,7 @@ public void RemoveMapByIndex()
392394 {
393395 const int GRAPH_ID = 100 ; // PLAYER.MAP, index 1.
394396 const int INDEX = 1 ;
397+
395398 var fpg = new FPG ( this . GetAssetPath ( SharedConstants . FILENAME_FPG_TEST ) ) ;
396399
397400 fpg . RemoveAt ( INDEX ) ;
@@ -403,6 +406,7 @@ public void RemoveMapByIndex()
403406 public void FailRemoveMapByIndex ( )
404407 {
405408 var fpg = new FPG ( this . GetAssetPath ( SharedConstants . FILENAME_FPG_TEST ) ) ;
409+
406410 Assert . ThrowsException < IndexOutOfRangeException > ( ( ) => fpg . RemoveAt ( - 1 ) ) ;
407411 Assert . ThrowsException < IndexOutOfRangeException > ( ( ) => fpg . RemoveAt ( fpg . Count + 1 ) ) ;
408412 }
@@ -412,6 +416,7 @@ public void FailRemoveMapByIndexWhenFPGIsEmpty()
412416 {
413417 var pal = new PAL ( this . GetAssetPath ( SharedConstants . FILENAME_PAL_SPACE ) ) ;
414418 var fpg = new FPG ( pal ) ;
419+
415420 Assert . ThrowsException < InvalidOperationException > ( ( ) => fpg . Remove ( 0 ) ) ;
416421 }
417422
0 commit comments