Fixing tests: order of AbstractScoresCache.getScores wasn't guaranteed

josemduarte · josemduarte · commit b99e061fffaf · 2015-07-24T17:02:17.000+02:00
and the test was failing in some computers
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java
@@ -1,9 +1,9 @@
 package org.biojava.nbio.structure.align.multiple;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * Abstact implementation of the {@link ScoresCache} with the shared code used
@@ -26,7 +26,7 @@ protected AbstractScoresCache(AbstractScoresCache cache) {
 	@Override
 	public void putScore(String property, Double score) {
 		if(scores == null) {
-			scores = new HashMap<String, Double>();
+			scores = new TreeMap<String, Double>();
 		}
 		scores.put(property, score);
 	}
diff --git a/biojava-structure/src/test/resources/testMSTA1.fatcat b/biojava-structure/src/test/resources/testMSTA1.fatcat
@@ -4,8 +4,8 @@ BlockSets: 2
 Blocks: 4 
 Length: 40 
 Core Length: 7 
-RMSD: 14.53 
-AvgTM-score: 0.01
+AvgTM-score: 0.01 
+RMSD: 14.53
 
 Chain 01: ---S-tDaErLkhl--IvTpSgAgeq----NmIgMtPt-viAv---HyL-dEt-eqWe
           11 1 1111111   2222222222     33333333 3 3   4444 444 4 44
diff --git a/biojava-structure/src/test/resources/testMSTA1.xml b/biojava-structure/src/test/resources/testMSTA1.xml
@@ -66,8 +66,8 @@
       <ScoresCache />
     </BlockSet>
     <ScoresCache>
-      <RMSD value="14.534137323749885" />
       <AvgTM-score value="0.011220778229159392" />
+      <RMSD value="14.534137323749885" />
     </ScoresCache>
   </MultipleAlignment>
   <ScoresCache />
diff --git a/biojava-structure/src/test/resources/testMSTA2.fatcat b/biojava-structure/src/test/resources/testMSTA2.fatcat
@@ -4,8 +4,8 @@ BlockSets: 2
 Blocks: 3 
 Length: 43 
 Core Length: 39 
-RMSD: 1.62 
-AvgTM-score: 0.21
+AvgTM-score: 0.21 
+RMSD: 1.62
 
 Chain 01: VLSEGEWQLVLHVWAKVEADVAghgqdil--IRLFKSHPeTlekfdrfkhlkteaemkasedlkkhgvtvltalgailkkkghheaelkplaqshatkhkipikylefiseaiihvlhsrhpgdf-GADAQGAMNKAL
           1111111111111111111111         22222222 2                                                                                     333333333333
diff --git a/biojava-structure/src/test/resources/testMSTA2.xml b/biojava-structure/src/test/resources/testMSTA2.xml
@@ -68,8 +68,8 @@
       <ScoresCache />
     </BlockSet>
     <ScoresCache>
-      <RMSD value="1.6157522409255982" />
       <AvgTM-score value="0.20901795047594007" />
+      <RMSD value="1.6157522409255982" />
     </ScoresCache>
   </MultipleAlignment>
   <ScoresCache />
