From 9df699db59f990809f9a22127ea9fa1845c0b1c3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 7 Feb 2020 15:35:09 +0100
Subject: [PATCH] Reorder tests

---
 .../api/pushrules/PushrulesConditionTest.kt   | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt b/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
index f404eafb67..f334c0f099 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
@@ -31,6 +31,10 @@ import org.junit.Test
 
 class PushrulesConditionTest {
 
+    /* ==========================================================================================
+     * Test EventMatchCondition
+     * ========================================================================================== */
+
     @Test
     fun test_eventmatch_type_condition() {
         val condition = EventMatchCondition("type", "m.room.message")
@@ -120,6 +124,24 @@ class PushrulesConditionTest {
         assert(condition.isSatisfied(simpleTextEvent))
     }
 
+    @Test
+    fun test_notice_condition() {
+        val conditionEqual = EventMatchCondition("content.msgtype", "m.notice")
+
+        Event(
+                type = "m.room.message",
+                eventId = "mx0",
+                content = MessageTextContent("m.notice", "A").toContent(),
+                originServerTs = 0,
+                roomId = "2joined").also {
+            assertTrue("Notice", conditionEqual.isSatisfied(it))
+        }
+    }
+
+    /* ==========================================================================================
+     * Test RoomMemberCountCondition
+     * ========================================================================================== */
+
     @Test
     fun test_roommember_condition() {
         val conditionEqual3 = RoomMemberCountCondition("3")
@@ -164,18 +186,4 @@ class PushrulesConditionTest {
             assertFalse("This room has more than 3 members", conditionLessThan3.isSatisfied(it, roomGetterStub))
         }
     }
-
-    @Test
-    fun test_notice_condition() {
-        val conditionEqual = EventMatchCondition("content.msgtype", "m.notice")
-
-        Event(
-                type = "m.room.message",
-                eventId = "mx0",
-                content = MessageTextContent("m.notice", "A").toContent(),
-                originServerTs = 0,
-                roomId = "2joined").also {
-            assertTrue("Notice", conditionEqual.isSatisfied(it))
-        }
-    }
 }