Browse Source

Don't expose batch start and end

tags/v0.10.0
Chris Smith 5 years ago
parent
commit
d7617d2caa

+ 2
- 0
CHANGELOG View File

1
 vNEXT (in development)
1
 vNEXT (in development)
2
 
2
 
3
+ * Batch start and end events are no longer included in BatchReceived events
4
+
3
 v0.9.0
5
 v0.9.0
4
 
6
 
5
  * Improve DSL for creating an IrcClient to allow parameters to be passed to server and profile
7
  * Improve DSL for creating an IrcClient to allow parameters to be passed to server and profile

+ 1
- 2
src/main/kotlin/com/dmdirc/ktirc/events/mutators/BatchMutator.kt View File

22
 
22
 
23
     private fun startBatch(client: IrcClient, event: BatchStarted) {
23
     private fun startBatch(client: IrcClient, event: BatchStarted) {
24
         client.serverState.batches[event.referenceId] =
24
         client.serverState.batches[event.referenceId] =
25
-                Batch(event.batchType, event.params.asList(), event.metadata.batchId, mutableListOf(event))
25
+                Batch(event.batchType, event.params.asList(), event.metadata.batchId, mutableListOf())
26
     }
26
     }
27
 
27
 
28
     private fun finishBatch(client: IrcClient, event: BatchFinished): List<IrcEvent> {
28
     private fun finishBatch(client: IrcClient, event: BatchFinished): List<IrcEvent> {
29
         client.serverState.batches.remove(event.referenceId)?.let {
29
         client.serverState.batches.remove(event.referenceId)?.let {
30
-            it.events += event
31
             val batch = BatchReceived(it.events[0].metadata, it.type, it.arguments.toTypedArray(), it.events)
30
             val batch = BatchReceived(it.events[0].metadata, it.type, it.arguments.toTypedArray(), it.events)
32
             if (it.parent == null) {
31
             if (it.parent == null) {
33
                 return listOf(batch)
32
                 return listOf(batch)

+ 3
- 5
src/test/kotlin/com/dmdirc/ktirc/events/mutators/BatchMutatorTest.kt View File

40
         serverState.batches["abcdef"]?.let {
40
         serverState.batches["abcdef"]?.let {
41
             assertEquals(listOf("foo", "bar"), it.arguments)
41
             assertEquals(listOf("foo", "bar"), it.arguments)
42
             assertEquals("netsplit", it.type)
42
             assertEquals("netsplit", it.type)
43
-            assertEquals(listOf(event), it.events)
43
+            assertTrue(it.events.isEmpty())
44
             assertNull(it.parent)
44
             assertNull(it.parent)
45
         }
45
         }
46
     }
46
     }
86
         val event = events[0] as BatchReceived
86
         val event = events[0] as BatchReceived
87
         assertEquals("netsplit", event.type)
87
         assertEquals("netsplit", event.type)
88
         assertArrayEquals(arrayOf("p1", "p2"), event.params)
88
         assertArrayEquals(arrayOf("p1", "p2"), event.params)
89
-        assertEquals(2, event.events.size)
89
+        assertEquals(1, event.events.size)
90
         assertTrue(event.events[0] is ServerConnected)
90
         assertTrue(event.events[0] is ServerConnected)
91
-        assertTrue(event.events[1] is BatchFinished)
92
     }
91
     }
93
 
92
 
94
     @Test
93
     @Test
104
         assertEquals(1, parent?.size)
103
         assertEquals(1, parent?.size)
105
 
104
 
106
         val event = parent?.get(0) as BatchReceived
105
         val event = parent?.get(0) as BatchReceived
107
-        assertEquals(2, event.events.size)
106
+        assertEquals(1, event.events.size)
108
         assertTrue(event.events[0] is ServerConnected)
107
         assertTrue(event.events[0] is ServerConnected)
109
-        assertTrue(event.events[1] is BatchFinished)
110
     }
108
     }
111
 
109
 
112
     @Test
110
     @Test

Loading…
Cancel
Save