Skip to content

Commit 31e1138

Browse files
RHeniganRHenigan
committed
Update Test Files for AndroidJUnit4
1 parent 0996f6c commit 31e1138

14 files changed

Lines changed: 257 additions & 101 deletions

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.smartdevicelink.protocol;
22

3+
import android.support.test.runner.AndroidJUnit4;
34
import android.util.Log;
45

5-
import com.smartdevicelink.AndroidTestCase2;
66
import com.smartdevicelink.SdlConnection.SdlConnection;
77
import com.smartdevicelink.protocol.WiProProtocol.MessageFrameAssembler;
88
import com.smartdevicelink.protocol.enums.SessionType;
@@ -14,15 +14,27 @@
1414

1515
import junit.framework.Assert;
1616

17+
import org.junit.Before;
18+
import org.junit.Test;
19+
import org.junit.runner.RunWith;
20+
1721
import java.io.ByteArrayOutputStream;
1822
import java.lang.reflect.Method;
1923
import java.util.List;
2024

25+
import static junit.framework.TestCase.assertEquals;
26+
import static junit.framework.TestCase.assertFalse;
27+
import static junit.framework.TestCase.assertNotNull;
28+
import static junit.framework.TestCase.assertNull;
29+
import static android.support.test.InstrumentationRegistry.getContext;
30+
import static junit.framework.TestCase.assertTrue;
31+
2132
/**
2233
* This is a unit test class for the SmartDeviceLink library project class :
2334
* {@link com.smartdevicelink.protocol.BinaryFrameHeader}
2435
*/
25-
public class WiProProtocolTests extends AndroidTestCase2 {
36+
@RunWith(AndroidJUnit4.class)
37+
public class WiProProtocolTests {
2638

2739
int max_int = 2147483647;
2840
byte[] payload;
@@ -97,12 +109,14 @@ public void onResetIncomingHeartbeat(SessionType sessionType,byte sessionID) {}
97109
public void onProtocolError(String info, Exception e) {}
98110
};
99111
DidReceiveListener onProtocolMessageReceivedListener = new DidReceiveListener();
100-
112+
113+
@Test
101114
public void testBase(){
102115
WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
103116

104117
}
105-
118+
119+
@Test
106120
public void testVersion(){
107121
WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
108122

@@ -135,7 +149,8 @@ public void testVersion(){
135149
wiProProtocol.setVersion((byte)0x00);
136150
assertEquals((byte)0x01,wiProProtocol.getVersion());
137151
}
138-
152+
153+
@Test
139154
public void testMtu(){
140155
WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
141156

@@ -169,7 +184,8 @@ public void testMtu(){
169184
}
170185

171186
}
172-
187+
188+
@Test
173189
public void testHandleFrame(){
174190
SampleRpc sampleRpc = new SampleRpc(4);
175191
WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
@@ -180,6 +196,8 @@ public void testHandleFrame(){
180196
Assert.fail("Exceptin during handleFrame - " + e.toString());
181197
}
182198
}
199+
200+
@Test
183201
public void testHandleFrameCorrupt(){
184202
SampleRpc sampleRpc = new SampleRpc(4);
185203
BinaryFrameHeader header = sampleRpc.getBinaryFrameHeader(true);
@@ -193,7 +211,8 @@ public void testHandleFrameCorrupt(){
193211
Assert.fail("Exceptin during handleFrame - " + e.toString());
194212
}
195213
}
196-
214+
215+
@Test
197216
public void testHandleSingleFrameMessageFrame(){
198217
SampleRpc sampleRpc = new SampleRpc(4);
199218
WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
@@ -208,7 +227,8 @@ public void testHandleSingleFrameMessageFrame(){
208227
Assert.fail("Exceptin during handleSingleFrameMessageFrame - " + e.toString());
209228
}
210229
}
211-
230+
231+
@Test
212232
public void testHandleSingleFrameMessageFrameCorruptBfh(){
213233
SampleRpc sampleRpc = new SampleRpc(4);
214234

@@ -246,13 +266,14 @@ public void testHandleSingleFrameMessageFrameCorruptBfh(){
246266
}
247267

248268

249-
269+
@Before
250270
public void setUp(){
251-
config = new MultiplexTransportConfig(this.mContext,SdlUnitTestContants.TEST_APP_ID);
271+
config = new MultiplexTransportConfig(getContext(),SdlUnitTestContants.TEST_APP_ID);
252272
connection = new SdlConnectionTestClass(config, null);
253273
protocol = new WiProProtocol(connection);
254274
}
255-
275+
276+
@Test
256277
public void testNormalCase(){
257278
setUp();
258279
payload = new byte[]{0x00,0x02,0x05,0x01,0x01,0x01,0x05,0x00};
@@ -296,7 +317,8 @@ public void testNormalCase(){
296317
assertNull(np_exception);
297318
assertNull(oom_error);
298319
}
299-
320+
321+
@Test
300322
public void testOverallocatingAccumulator(){
301323
setUp();
302324
ByteArrayOutputStream builder = new ByteArrayOutputStream();
@@ -364,7 +386,7 @@ public void onTransportConnected() {
364386
public void onTransportDisconnected(String info) {
365387
connected = false;
366388
//Grab a currently running router service
367-
RouterServiceValidator rsvp2 = new RouterServiceValidator(mContext);
389+
RouterServiceValidator rsvp2 = new RouterServiceValidator(getContext());
368390
rsvp2.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
369391
assertTrue(rsvp2.validate());
370392
assertNotNull(rsvp2.getService());

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
package com.smartdevicelink.test.protocol;
22

3-
import com.smartdevicelink.AndroidTestCase2;
3+
import android.support.test.runner.AndroidJUnit4;
4+
45
import com.smartdevicelink.protocol.BinaryFrameHeader;
56
import com.smartdevicelink.protocol.enums.FunctionID;
67
import com.smartdevicelink.test.SampleRpc;
78

89
import junit.framework.Assert;
910

10-
public class BinaryFrameHeaderTests extends AndroidTestCase2 {
11+
import org.junit.Test;
12+
import org.junit.runner.RunWith;
13+
14+
import static junit.framework.TestCase.assertEquals;
15+
import static junit.framework.TestCase.assertFalse;
16+
import static junit.framework.TestCase.assertNotNull;
17+
import static junit.framework.TestCase.assertNull;
18+
import static junit.framework.TestCase.assertTrue;
19+
20+
@RunWith(AndroidJUnit4.class)
21+
public class BinaryFrameHeaderTests {
1122

1223
public static final byte RPC_TYPE_REQUEST = 0x00;
1324
public static final byte RPC_TYPE_RESPONSE = 0x01;
@@ -32,7 +43,8 @@ public BinaryFrameHeader safeParse(byte[] array){
3243
return null;
3344
}
3445
}
35-
46+
47+
@Test
3648
public void testAssemblyAndParse(){
3749
BinaryFrameHeader bfh = createDummyBfh();
3850

@@ -55,7 +67,8 @@ public void testAssemblyAndParse(){
5567
assertTrue(bfh.getJsonSize() == parsedBfh.getJsonSize());
5668

5769
}
58-
70+
71+
@Test
5972
public void testCorruptHeader(){
6073
BinaryFrameHeader bfh = createDummyBfh();
6174
bfh.setJsonSize(5);
@@ -78,7 +91,8 @@ public void testCorruptHeader(){
7891
BinaryFrameHeader head = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
7992
assertNull(head);
8093
}
81-
94+
95+
@Test
8296
public void testJsonSetException(){
8397
try{
8498
BinaryFrameHeader bfh = createDummyBfh();
@@ -88,7 +102,8 @@ public void testJsonSetException(){
88102
//Pass
89103
}
90104
}
91-
105+
106+
@Test
92107
public void testAlteredDataInSampleRpc(){
93108
SampleRpc sampleRpc = new SampleRpc(4);
94109
//Create a corrupted header

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,45 @@
11
package com.smartdevicelink.test.proxy;
22

33

4-
import com.smartdevicelink.AndroidTestCase2;
4+
import android.support.test.runner.AndroidJUnit4;
5+
56
import com.smartdevicelink.proxy.RPCRequest;
67
import com.smartdevicelink.proxy.rpc.GetSystemCapability;
78
import com.smartdevicelink.test.Config;
89

10+
import org.junit.Before;
11+
import org.junit.Test;
12+
import org.junit.runner.RunWith;
13+
14+
import static junit.framework.TestCase.assertEquals;
15+
import static junit.framework.TestCase.assertNotNull;
916

10-
public class RPCRequestTest extends AndroidTestCase2 {
17+
@RunWith(AndroidJUnit4.class)
18+
public class RPCRequestTest {
1119

1220
public static final int SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
1321

1422
private static final int CORR_ID = 402;
1523

1624
protected RPCRequest msg;
1725

18-
@Override
26+
@Before
1927
public void setUp(){
2028
this.msg = new GetSystemCapability();
21-
29+
2230
}
2331

32+
@Test
2433
public void testCreation(){
2534
assertNotNull("Object creation failed.", msg);
2635
}
2736

37+
@Test
2838
public void testGetCorrelationId(){
2939
assertNotNull(this.msg.getCorrelationID());
3040
}
41+
42+
@Test
3143
public void testSettingCorrelationId(){
3244
assertNotNull(this.msg.getCorrelationID());
3345
msg.setCorrelationID(CORR_ID);

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.smartdevicelink.test.proxy;
22

33
import android.content.Context;
4+
import android.support.test.runner.AndroidJUnit4;
45
import android.telephony.TelephonyManager;
56
import android.util.Log;
67

7-
import com.smartdevicelink.AndroidTestCase2;
88
import com.smartdevicelink.exception.SdlException;
99
import com.smartdevicelink.exception.SdlExceptionCause;
1010
import com.smartdevicelink.proxy.RPCMessage;
@@ -28,6 +28,8 @@
2828

2929
import junit.framework.Assert;
3030

31+
import org.junit.Test;
32+
import org.junit.runner.RunWith;
3133
import org.mockito.invocation.InvocationOnMock;
3234
import org.mockito.stubbing.Answer;
3335

@@ -36,31 +38,26 @@
3638
import java.util.HashMap;
3739
import java.util.List;
3840

41+
import static junit.framework.TestCase.assertEquals;
42+
import static junit.framework.TestCase.assertNotNull;
43+
import static junit.framework.TestCase.assertTrue;
44+
import static junit.framework.TestCase.fail;
3945
import static org.mockito.ArgumentMatchers.any;
4046
import static org.mockito.Mockito.doAnswer;
4147
import static org.mockito.Mockito.doReturn;
4248
import static org.mockito.Mockito.mock;
49+
import static android.support.test.InstrumentationRegistry.getContext;
4350

44-
45-
public class SdlProxyBaseTests extends AndroidTestCase2 {
51+
@RunWith(AndroidJUnit4.class)
52+
public class SdlProxyBaseTests {
4653
public static final String TAG = "SdlProxyBaseTests";
4754

4855
int onUpdateListenerCounter, onFinishedListenerCounter, onResponseListenerCounter, onErrorListenerCounter, remainingRequestsExpected;
4956

50-
@Override
51-
protected void setUp() throws Exception{
52-
super.setUp();
53-
}
54-
55-
@Override
56-
protected void tearDown() throws Exception {
57-
super.tearDown();
58-
//Nothing here for now
59-
}
60-
6157
/**
6258
* Test SdlProxyBase for handling null SdlProxyConfigurationResources
6359
*/
60+
@Test
6461
public void testNullSdlProxyConfigurationResources() {
6562
SdlProxyALM proxy = null;
6663
SdlProxyBuilder.Builder builder = new SdlProxyBuilder.Builder(mock(IProxyListenerALM.class), "appId", "appName", true, getContext());
@@ -127,6 +124,7 @@ public void testNullSdlProxyConfigurationResources() {
127124
}
128125
}
129126

127+
@Test
130128
public void testRemoteDisplayStreaming(){
131129
SdlProxyALM proxy = null;
132130
SdlProxyBuilder.Builder builder = new SdlProxyBuilder.Builder(mock(IProxyListenerALM.class), "appId", "appName", true, getContext());
@@ -144,18 +142,22 @@ public void testRemoteDisplayStreaming(){
144142
}
145143
}
146144

145+
@Test
147146
public void testSendRPCsAllSucceed(){
148147
testSendMultipleRPCs(false, 1);
149148
}
150149

150+
@Test
151151
public void testSendRPCsSomeFail(){
152152
testSendMultipleRPCs(false, 2);
153153
}
154154

155+
@Test
155156
public void testSendSequentialRPCsAllSucceed(){
156157
testSendMultipleRPCs(true, 1);
157158
}
158159

160+
@Test
159161
public void testSendSequentialRPCsSomeFail(){
160162
testSendMultipleRPCs(true, 2);
161163
}

0 commit comments

Comments
 (0)