Project

General

Profile

« Previous | Next » 

Revision a179ac89

Added by Cherian Mathew over 8 years ago

#5297 Implement monitor feedback, Add corresponding tests

#5297 Add inconsistent monitor feedback test

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ProgressMonitorServiceTest.java
9 9
 */
10 10
package eu.etaxonomy.taxeditor.service;
11 11

  
12
import java.io.Serializable;
13
import java.util.ArrayList;
14
import java.util.Arrays;
15
import java.util.List;
12 16
import java.util.UUID;
13 17

  
14 18
import org.apache.log4j.Logger;
......
22 26
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
23 27
import eu.etaxonomy.cdm.common.monitor.RemotingProgressMonitor;
24 28
import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
29
import eu.etaxonomy.taxeditor.operation.IFeedbackGenerator;
25 30
import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
26 31
import eu.etaxonomy.taxeditor.store.CdmStore;
27 32

  
......
47 52

  
48 53
    @Test
49 54
    public void testMonitLongRunningMethod() throws InterruptedException {
50
        UUID uuid = testService.monitLongRunningMethod(null);
55
        UUID uuid = testService.monitLongRunningMethod(null, null);
51 56
        int pollInterval = 1000;
52 57
        RemotingProgressMonitor expectedMonitor = new RemotingProgressMonitor();
53 58
        expectedMonitor.setResult("Success");
54 59
        expectedMonitor.addReport("Report");
55 60
        expectedMonitor.done();
56
        IRemotingProgressMonitor remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
61
        CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
57 62
                uuid,
58 63
                pollInterval,
59 64
                new MockPostMoniteredOperationEnabled(expectedMonitor, uuid),
65
                (IFeedbackGenerator)null,
60 66
                new NullProgressMonitor());
61 67
    }
62 68

  
......
64 70
    public void testMonitLongRunningMethodByChangingUser() throws InterruptedException {
65 71

  
66 72
        IllegalStateException ise = new IllegalStateException("IllegalStateException");
67
        UUID uuid = testService.monitLongRunningMethod(ise);
73
        UUID uuid = testService.monitLongRunningMethod(ise, null);
68 74
        authenticateExtraUser();
69 75
        IRemotingProgressMonitor monitor = progressMonitorService.getRemotingMonitor(uuid);
70 76
        Assert.assertNull(monitor);
......
74 80
    @Test
75 81
    public void testMonitLongRunningMethodWithException() throws InterruptedException {
76 82
        IllegalStateException ise = new IllegalStateException("IllegalStateException");
77
        UUID uuid = testService.monitLongRunningMethod(ise);
83
        UUID uuid = testService.monitLongRunningMethod(ise, null);
78 84
        int pollInterval = 1000;
79 85
        RemotingProgressMonitor expectedMonitor = new RemotingProgressMonitor();
80 86
        expectedMonitor.setResult(ise);
81 87
        expectedMonitor.setIsFailed(true);
82 88
        expectedMonitor.done();
83
        IRemotingProgressMonitor remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
89
        CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
84 90
                uuid,
85 91
                pollInterval,
86 92
                new MockPostMoniteredOperationEnabled(expectedMonitor, uuid),
93
                (IFeedbackGenerator)null,
87 94
                new NullProgressMonitor());
88 95
    }
89 96

  
90 97
    @Test
91
    public void testMonitLongRunningMethodWithInterrupt() throws InterruptedException {
98
    public void testMonitLongRunningMethodWithInterrupt() {
92 99
        IllegalStateException ise = new IllegalStateException("Interrupted Exception");
93
        final UUID uuid = testService.monitLongRunningMethod(ise);
100
        final UUID uuid = testService.monitLongRunningMethod(ise, null);
94 101
        final int pollInterval = 1000;
95 102
        final RemotingProgressMonitor expectedMonitor = new RemotingProgressMonitor();
96 103
        expectedMonitor.setResult(ise);
......
102 109
            @Override
103 110
            public void run() {
104 111
                try {
105
                    IRemotingProgressMonitor remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
112
                    CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
106 113
                            uuid,
107 114
                            pollInterval,
108 115
                            null,
116
                            (IFeedbackGenerator)null,
109 117
                            new NullProgressMonitor());
110 118
                } catch (InterruptedException e) {
111 119

  
112 120
                }
113 121
            }
114

  
115 122
        };
116 123
        thread.start();
117 124
        while(!progressMonitorService.isMonitorThreadRunning(uuid)) {}
......
128 135
    @Test
129 136
    public void testMonitLongRunningMethodWithCancellation() throws InterruptedException {
130 137

  
131
        final UUID uuid = testService.monitLongRunningMethod(null);
138
        final UUID uuid = testService.monitLongRunningMethod(null, null);
132 139
        final int pollInterval = 1000;
133 140
        final RemotingProgressMonitor expectedMonitor = new RemotingProgressMonitor();
134 141
        expectedMonitor.setResult("Cancelled");
......
139 146
            @Override
140 147
            public void run() {
141 148
                try {
142
                    IRemotingProgressMonitor remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
149
                    CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
143 150
                            uuid,
144 151
                            pollInterval,
145 152
                            null,
153
                            (IFeedbackGenerator)null,
146 154
                            new NullProgressMonitor());
147 155
                } catch (InterruptedException e) {
148 156

  
......
159 167

  
160 168
    }
161 169

  
170
    @Test
171
    public void testMonitLongRunningMethodWithWaitForFeedback() throws InterruptedException {
172

  
173
        List<String> feedbacks = Arrays.asList("feedback1", "feedback2");
174
        List<IFeedbackGenerator> feebackGenerators = new ArrayList<IFeedbackGenerator>();
175
        final RemotingProgressMonitor expectedMonitor = new RemotingProgressMonitor();
176
        expectedMonitor.setResult("Success");
177
        for(String feedback : feedbacks) {
178
            feebackGenerators.add(new MockFeedbackGenerator(feedback));
179
            expectedMonitor.addReport(feedback);
180
        }
181
        expectedMonitor.addReport("Report");
182
        expectedMonitor.done();
183

  
184
        final UUID uuid = testService.monitLongRunningMethod(null, feedbacks);
185
        final int pollInterval = 1000;
186

  
187
        CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
188
                uuid,
189
                pollInterval,
190
                new MockPostMoniteredOperationEnabled(expectedMonitor, uuid),
191
                feebackGenerators,
192
                new NullProgressMonitor());
193

  
194
        feebackGenerators.remove(1);
195

  
196
        final UUID newUuid = testService.monitLongRunningMethod(null, feedbacks);
197

  
198
        try {
199
            CdmStore.getProgressMonitorClientManager().pollMonitor("Testing Progress Monitor",
200
                    newUuid,
201
                    pollInterval,
202
                    new MockPostMoniteredOperationEnabled(expectedMonitor, newUuid),
203
                    feebackGenerators,
204
                    new NullProgressMonitor());
205
            Assert.fail("Exception due to inconsistent number of feedback generators not thrown");
206
        } catch(IllegalStateException ise) {
207

  
208
        }
209

  
210

  
211
    }
212

  
162 213

  
163 214
    class MockPostMoniteredOperationEnabled implements IPostMoniteredOperationEnabled {
164 215

  
......
188 239
            Assert.assertEquals(expectedMonitor.isDone(), monitor.isDone());
189 240
            Assert.assertTrue(!progressMonitorService.isMonitorThreadRunning(monitorUuid));
190 241
        }
242
    }
243

  
244
    class MockFeedbackGenerator implements IFeedbackGenerator {
245

  
246
        private String feedback;
247

  
248
        public MockFeedbackGenerator(String feedback) {
249
            this.feedback = feedback;
250
        }
251
        /**
252
         * {@inheritDoc}
253
         */
254
        @Override
255
        public Serializable generateFeedback() {
256
            return feedback;
257
        }
191 258

  
192 259
    }
193 260
}

Also available in: Unified diff