diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3.java index 3a4de3a82..ef2a5083c 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -30,7 +31,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3 extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -41,20 +41,16 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); //Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); @@ -88,16 +84,7 @@ public void test001_testConnectandDisconnect() { @Test public void test002_testConnectandDisconnect_NewBMPSupported() { mByteCommunicationSimulatorS3.setIsNewBMPSupported(true); - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - boolean result = mWaitTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java index f04fa4111..87369358d 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3R.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -49,7 +50,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3R extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; ByteCommunicationSimulatorS3R mByteCommunicationSimulatorS3R; @Before public void setUp() { @@ -58,19 +58,15 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3R); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS);//Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); @@ -118,16 +114,7 @@ public void test001_testConnectandDisconnect() { @Test public void test002_ConnectandTestBMP390() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); @@ -159,16 +146,7 @@ public void test002_ConnectandTestBMP390() { @Test public void test003_ConnectandTestCalibParamRead() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } @@ -214,16 +192,7 @@ public void test003_ConnectandTestCalibParamRead() { @Test public void test004_ConnectandTestDefaultLNAccelAndGyroCalibParam() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } @@ -266,16 +235,7 @@ public void test004_ConnectandTestDefaultLNAccelAndGyroCalibParam() { @Test public void test005_ConnectandTestDefaultWRAccelCalibParam() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } @@ -306,16 +266,7 @@ public void test005_ConnectandTestDefaultWRAccelCalibParam() { @Test public void test006_ConnectandTestDefaultMagCalibParam() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } @@ -335,16 +286,7 @@ public void test006_ConnectandTestDefaultMagCalibParam() { @Test public void test007_ConnectandTestDefaultHighGAccelCalibParam() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } @@ -363,16 +305,7 @@ public void test007_ConnectandTestDefaultHighGAccelCalibParam() { @Test public void test008_ConnectandTestDefaultAltMagCalibParam() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); } diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_CRC_Streaming.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_CRC_Streaming.java index 568d693c2..af7afaf6f 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_CRC_Streaming.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_CRC_Streaming.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_CRC_Streaming extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming.java index fab8ec632..0752fbfe3 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check.java index 74bb8a4cb..0c31a771b 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Fail.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Fail.java index 4bdc92711..be362947a 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Fail.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Fail.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -30,7 +31,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Fail extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; public static int CONTIGUOUS_TIMESTAMP_TICKS_LIMIT = (10*32768); @@ -41,23 +41,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Overflow.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Overflow.java index a4f46feec..42dbba835 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Overflow.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Overflow.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming_Contiguous_Check_Overflow extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes.java index 4b89df292..0eeab0c01 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes_2.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes_2.java index a5ed4bd21..6cf3777df 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes_2.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes_2.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -29,7 +30,6 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3_Streaming_Throw_Bytes_2 extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mCalibrationTask; TaskCompletionSource mStreamingTask; ByteCommunicationSimulatorS3 mByteCommunicationSimulatorS3; @@ -40,23 +40,19 @@ public void setUp() { mDevice.setTestRadio(mByteCommunicationSimulatorS3); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } ArrayList mListOJC; @Test public void test001_testStreaming() { mListOJC = new ArrayList(); mByteCommunicationSimulatorS3.setIsNewBMPSupported(false); - mCalibrationTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mCalibrationTask = new TaskCompletionSource<>(); - mStreamingTask = new TaskCompletionSource(); - try { - boolean result = mCalibrationTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); + mStreamingTask = new TaskCompletionSource(); try { mDevice.startStreaming(); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11.java index 352fb6060..8d2d07628 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -28,26 +29,21 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3lns0_16_11 extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; @Before public void setUp() { mDevice = new ShimmerPC("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11("COM99")); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_bt_streaming.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_bt_streaming.java index 26851dbe5..a84b082b3 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_bt_streaming.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_bt_streaming.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -28,26 +29,21 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_bt_streaming extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; @Before public void setUp() { mDevice = new ShimmerPC("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sd_bt_streaming("COM99")); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(5, TimeUnit.SECONDS); //Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java index 37fba3b78..7eb4ec253 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -28,26 +29,21 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; @Before public void setUp() { mDevice = new ShimmerPC("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sd_only("COM99")); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS);//Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java index d849f02df..6b0695dbf 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -28,26 +29,21 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; @Before public void setUp() { mDevice = new ShimmerPC("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sync_master("COM99")); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS);//Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java index 9ef38ea74..2b20f77a4 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java @@ -1,4 +1,5 @@ package com.shimmerresearch.shimmer3.communication; +import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -28,26 +29,21 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Test methods will be run in alphabetical order public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave extends BasicProcessWithCallBack{ ShimmerPC mDevice; - TaskCompletionSource mWaitTask; @Before public void setUp() { mDevice = new ShimmerPC("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sync_slave("COM99")); setWaitForData(mDevice); } + + @After + public void tearDown() { + mDevice.disconnectNoException(); + } @Test public void test001_testConnectandDisconnect() { - mWaitTask = new TaskCompletionSource(); - mDevice.connect("",""); - - mWaitTask = new TaskCompletionSource<>(); - try { - boolean result = mWaitTask.getTask().waitForCompletion(3, TimeUnit.SECONDS);//Just to give time to connect to finish - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + ByteCommunicationTestUtils.connectAndWaitUntilInitialised(mDevice); if (!mDevice.isConnected()) { assert(false); diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/ByteCommunicationTestUtils.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/ByteCommunicationTestUtils.java new file mode 100644 index 000000000..5722ce6bf --- /dev/null +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/ByteCommunicationTestUtils.java @@ -0,0 +1,37 @@ +package com.shimmerresearch.shimmer3.communication; + +import static org.junit.Assert.fail; + +import com.shimmerresearch.bluetooth.ShimmerBluetooth.BT_STATE; +import com.shimmerresearch.pcDriver.ShimmerPC; + +/** Shared helpers for the byte-communication simulator tests. */ +public class ByteCommunicationTestUtils { + + /** Generous on purpose: a connect to the simulator normally finishes in well under a second, + * but a loaded CI runner can stall it for several. Only a genuine hang should hit this. */ + public static final long CONNECT_TIMEOUT_MS = 30000; + + /** + * Connects and blocks until the device has finished its post-connect config read (infomem, + * calibration, etc.), i.e. isInitialised() is set and the state has moved to CONNECTED. + * isConnected() alone is not enough - it turns true before that read has run, so a fixed + * sleep made these tests flaky on slow runners. + */ + public static void connectAndWaitUntilInitialised(ShimmerPC device) { + device.connect("",""); + long deadline = System.currentTimeMillis() + CONNECT_TIMEOUT_MS; + while (!(device.isInitialised() && device.getBluetoothRadioState()==BT_STATE.CONNECTED)) { + if (System.currentTimeMillis() > deadline) { + fail("Device did not finish initialising within " + CONNECT_TIMEOUT_MS + " ms (state: " + device.getBluetoothRadioState() + ")"); + } + try { + Thread.sleep(20); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + fail("Interrupted while waiting for the device to initialise"); + } + } + } + +}