Fix flakiness in tests across modules

Author: lycoris106

lti/lti-common/src/test/org/sakaiproject/lti/util/SakaiKeySetUtilTest.java

@@ -161,18 +161,21 @@ public void testRotationAndKeySet()
 
         String keySetJSON = SakaiKeySetUtil.getKeySet();
         assertNotNull(keySetJSON);
-        assertTrue(keySetJSON.contains("{\"keys\":[{\"kty\":"));
-        assertTrue(keySetJSON.contains(",\"alg\":\"RS256\""));
+        
         JSONObject ks_json = LTIUtil.parseJSONObject(keySetJSON);
+        assertNotNull(ks_json);
+
         JSONArray keys = (JSONArray) ks_json.get("keys");
+        assertNotNull(keys);
         assertEquals(keys.size(), 3);
+
         for(int i=0; i< keys.size(); i++) {
             JSONObject key = (JSONObject) keys.get(i);
             assertNotNull(key);
-            String kid = (String) key.get("kid");
-            assertNotNull(kid);
-            String n = (String) key.get("n");
-            assertNotNull(n);
+            assertNotNull(key.get("kid"));
+            assertNotNull(key.get("n"));
+            assertNotNull(key.get("kty"));
+            assertNotNull(key.get("alg"));
         }
 
         // Test the expiration of the previous key
@@ -184,11 +187,22 @@ public void testRotationAndKeySet()
 
         keySetJSON = SakaiKeySetUtil.getKeySet();
         assertNotNull(keySetJSON);
-        assertTrue(keySetJSON.contains("{\"keys\":[{\"kty\":"));
-        assertTrue(keySetJSON.contains(",\"alg\":\"RS256\""));
+
         ks_json = LTIUtil.parseJSONObject(keySetJSON);
+        assertNotNull(ks_json);
+        
         keys = (JSONArray) ks_json.get("keys");
+        assertNotNull(keys);
         assertEquals(keys.size(), 2);
+
+        for(int i=0; i< keys.size(); i++) {
+            JSONObject key = (JSONObject) keys.get(i);
+            assertNotNull(key);
+            assertNotNull(key.get("kid"));
+            assertNotNull(key.get("n"));
+            assertNotNull(key.get("kty"));
+            assertNotNull(key.get("alg"));
+        }
     }
 
 }

lti/tsugi-util/src/test/org/tsugi/lti13/LTI13ObjectTest.java

@@ -19,6 +19,7 @@
 import org.tsugi.lti13.objects.OpenIDClientRegistration;
 import org.tsugi.lti13.objects.LTIToolConfiguration;
 
+import com.fasterxml.jackson.databind.JsonNode; 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.tsugi.lti13.LTICustomVars;
@@ -243,7 +244,11 @@ public void testfour() throws com.fasterxml.jackson.core.JsonProcessingException
         ObjectMapper mapper = JacksonUtil.getLaxObjectMapper();
         OpenIDClientRegistration ocr1 = mapper.readValue(first, OpenIDClientRegistration.class);
         OpenIDClientRegistration ocr2 = mapper.readValue(second, OpenIDClientRegistration.class);
+		
 		assertTrue(ocr1.prettyPrintLog().contains("[email protected]"));
-		assertEquals(ocr1.prettyPrintLog(), ocr2.prettyPrintLog());
+
+        JsonNode expected = mapper.readTree(ocr1.prettyPrintLog());
+        JsonNode actual = mapper.readTree(ocr2.prettyPrintLog());
+        assertEquals(expected, actual);
 	}
 }

rwiki/rwiki-impl/impl/src/test/uk/ac/cam/caret/sakai/rwiki/component/service/impl/test/RWikiObjectServiceImplTest.java

@@ -23,6 +23,7 @@
 package uk.ac.cam.caret.sakai.rwiki.component.service.impl.test;
 
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 
 import uk.ac.cam.caret.sakai.rwiki.component.service.impl.RWikiObjectServiceImpl;
 import uk.ac.cam.caret.sakai.rwiki.model.RWikiCurrentObjectImpl;
@@ -82,7 +83,7 @@ public void testExtractReferencesExtractReferencesTwoReference() {
 	public void testExtractReferencesExtractReferencesTooLong() {
 		StringBuffer sb;
 		rwco = new RWikiCurrentObjectImpl();
-		HashSet<String> hs = new HashSet<String>();
+		HashSet<String> hs = new LinkedHashSet<>();
 
 		hs.add(longString(3990));
 		sb = rwosi.extractReferences(rwco, hs);

samigo/samigo-services/src/test/org/sakaiproject/tool/assessment/services/ItemCancellationTest.java

@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -212,6 +213,11 @@ private void assertItemCancellation(ItemDataIfc[] testItems, ItemDataIfc[] cance
 
         // Convert "saved" items to array
         ItemDataIfc[] savedItems = savedItemList.toArray(new ItemDataIfc[savedItemList.size()]);
+        
+        // Ensure deterministic order before comparing
+        Comparator<ItemDataIfc> byId = Comparator.comparing(ItemDataIfc::getItemId);
+        Arrays.sort(savedItems, byId);
+        Arrays.sort(cancelledTestItems, byId);
 
         // Test if we have same number of items
         Assert.assertEquals(cancelledTestItems.length, savedItems.length);