From 9791283578ed127e3100a47a21be5279d5cd16d0 Mon Sep 17 00:00:00 2001 From: Jason Watkins Date: Thu, 26 Mar 2015 11:13:41 -0700 Subject: [PATCH] Expanded MATLAB tests --- TestScripts/MATLAB Tests/openCloseTest.m | 4 ++++ TestScripts/MATLAB Tests/pauseTest.m | 6 +++--- TestScripts/MATLAB Tests/setConnTest.m | 7 ++++--- TestScripts/MATLAB Tests/tests.m | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/TestScripts/MATLAB Tests/openCloseTest.m b/TestScripts/MATLAB Tests/openCloseTest.m index b05a497..fc008ac 100644 --- a/TestScripts/MATLAB Tests/openCloseTest.m +++ b/TestScripts/MATLAB Tests/openCloseTest.m @@ -6,6 +6,10 @@ import XPlaneConnect.* socket = openUDP( 49007 ); +closeUDP( socket ); +assert(isequal(socket.isClosed(),1),'openCloseTest: socket is still open'); + +socket = openUDP( 49007 ); closeUDP( socket ); end diff --git a/TestScripts/MATLAB Tests/pauseTest.m b/TestScripts/MATLAB Tests/pauseTest.m index c7979a6..2e17fe6 100644 --- a/TestScripts/MATLAB Tests/pauseTest.m +++ b/TestScripts/MATLAB Tests/pauseTest.m @@ -5,15 +5,15 @@ addpath('../../MATLAB') import XPlaneConnect.* DREFS = {'sim/operation/override/override_planepath'}; -value = 0; % Resume + +value = 1; % Pause pauseSim(value); result = requestDREF(DREFS); assert(isequal(length(result),1),'pauseTest: requestDREF unsucessful-wrong number of elements returned'); assert(abs(result{1}(1)-value)<1e-4,'pauseTest: Pause Unsuccessful'); - -value = 1; % Pause +value = 0; % Resume pauseSim(value); result = requestDREF(DREFS); diff --git a/TestScripts/MATLAB Tests/setConnTest.m b/TestScripts/MATLAB Tests/setConnTest.m index e0f8c30..b2485f4 100644 --- a/TestScripts/MATLAB Tests/setConnTest.m +++ b/TestScripts/MATLAB Tests/setConnTest.m @@ -6,13 +6,14 @@ disp('Not Functional Yet!') addpath('../../MATLAB') import XPlaneConnect.* -DREFS = {'sim/operation/override/override_planepath'}; -value = 0; % Resume +DREFS = {'sim/cockpit/switches/gear_handle_status'}; -setConn(value); +setConn(49055); result = requestDREF(DREFS); assert(isequal(length(result),1),'setConnTest: requestDREF unsucessful-wrong number of elements returned'); +setConn(49009); + end diff --git a/TestScripts/MATLAB Tests/tests.m b/TestScripts/MATLAB Tests/tests.m index 4a8faae..8492faa 100644 --- a/TestScripts/MATLAB Tests/tests.m +++ b/TestScripts/MATLAB Tests/tests.m @@ -18,7 +18,8 @@ theTests = {{@openCloseTest, 'Open/Close Test', 0},... {@CTRLTest,'CTRL Test', 0},... {@POSITest,'POSI Test', 0},... {@pauseTest,'Pause Test', 0},... - {@struTest,'Struct Test', 0}}; + {@struTest,'Struct Test', 0},... + {@setConnTest, 'setConn Test', 0}}; for i=1:length(theTests) fprintf(['Test ',num2str(i),': ',theTests{i}{2},' - ']);