Fic issue where a Connect failure in the Focuser device was not reported. Make all Connected methods confirm that the set value is reflected in Get Connected.

Peter-Simpson · Peter-Simpson · commit 8b5f2092f9a3 · 2023-05-17T22:35:17.000+01:00
diff --git a/ConformU/Conform/Devices/CameraTester.cs b/ConformU/Conform/Devices/CameraTester.cs
@@ -327,20 +327,26 @@ public override bool Connected
         {
             get
             {
-                if (settings.DisplayMethodCalls)
-                    LogTestAndMessage("ConformanceCheck", "About to get Connected");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return camera.Connected;
             }
             set
             {
-                if (settings.DisplayMethodCalls)
-                    LogTestAndMessage("ConformanceCheck", "About to set Connected");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
                 SetTest("Connected");
                 SetAction("Waiting for Connected to become 'true'");
                 camera.Connected = value;
                 ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
+
         public override void ReadCanProperties()
         {
             // ICameraV1 properties
diff --git a/ConformU/Conform/Devices/CoverCalibratorTester.cs b/ConformU/Conform/Devices/CoverCalibratorTester.cs
@@ -173,13 +173,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return coverCalibratorDevice.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 coverCalibratorDevice.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/DomeTester.cs b/ConformU/Conform/Devices/DomeTester.cs
@@ -200,14 +200,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return domeDevice.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 domeDevice.Connected = value;
+                ResetTestActionStatus();
 
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
         public override void CheckCommonMethods()
diff --git a/ConformU/Conform/Devices/FilerWheelTester.cs b/ConformU/Conform/Devices/FilerWheelTester.cs
@@ -151,13 +151,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return filterWheel.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 filterWheel.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
         public override void PreRunCheck()
diff --git a/ConformU/Conform/Devices/FocuserTester.cs b/ConformU/Conform/Devices/FocuserTester.cs
@@ -167,21 +167,22 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return focuser.Connected;
             }
             set
             {
-                try
-                {
-                    LogDebug("Connected", "Setting connected state to: " + value.ToString());
-                    LogCallToDriver("Connected", "About to set Link property");
-                    focuser.Connected = value;
-                    LogDebug("AccessChecks", "Successfully changed connected state");
-                }
-                catch (Exception ex)
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
+                focuser.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
                 {
-                    LogIssue("Connected", "Error changing focuser connected state: " + ex.ToString());
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
                 }
             }
         }
diff --git a/ConformU/Conform/Devices/ObservingConditionsTester.cs b/ConformU/Conform/Devices/ObservingConditionsTester.cs
@@ -235,13 +235,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Absolute", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return m_ObservingConditions.Connected;
             }
             set
             {
-                LogCallToDriver("Absolute", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 m_ObservingConditions.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/RotatorTester.cs b/ConformU/Conform/Devices/RotatorTester.cs
@@ -178,15 +178,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
-                bool ConnectedRet = m_Rotator.Connected;
-                return ConnectedRet;
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
+                return m_Rotator.Connected;
             }
-
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 m_Rotator.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/SafetyMonitorTester.cs b/ConformU/Conform/Devices/SafetyMonitorTester.cs
@@ -179,13 +179,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return m_SafetyMonitor.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 m_SafetyMonitor.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/SwitchTester.cs b/ConformU/Conform/Devices/SwitchTester.cs
@@ -184,13 +184,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return m_Switch.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 m_Switch.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/TelescopeTester.cs b/ConformU/Conform/Devices/TelescopeTester.cs
@@ -443,17 +443,23 @@ public override bool Connected
         {
             get
             {
-                if (settings.DisplayMethodCalls)
-                    LogTestAndMessage("ConformanceCheck", "About to get Connected property");
-                bool ConnectedRet = telescopeDevice.Connected;
-                return ConnectedRet;
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
+                return telescopeDevice.Connected;
             }
-
             set
             {
-                if (settings.DisplayMethodCalls)
-                    LogTestAndMessage("ConformanceCheck", "About to set Connected property " + value.ToString());
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 telescopeDevice.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/ConformU/Conform/Devices/VideoTester.cs b/ConformU/Conform/Devices/VideoTester.cs
@@ -223,13 +223,23 @@ public override bool Connected
         {
             get
             {
-                LogCallToDriver("Connected", "About to get Connected property");
+                LogCallToDriver("ConformanceCheck", "About to get Connected");
                 return videoDevice.Connected;
             }
             set
             {
-                LogCallToDriver("Connected", "About to set Connected property");
+                LogCallToDriver("ConformanceCheck", "About to set Connected");
+                SetTest("Connected");
+                SetAction("Waiting for Connected to become 'true'");
                 videoDevice.Connected = value;
+                ResetTestActionStatus();
+
+                // Make sure that the value set is reflected in Connected GET
+                bool connectedState = Connected;
+                if (connectedState != value)
+                {
+                    throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");
+                }
             }
         }
 
diff --git a/WindowsInstaller/ConformU.iss b/WindowsInstaller/ConformU.iss
@@ -81,22 +81,22 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 ; 64bit OS - Install the 64bit app
-Source: "J:\ConformU\publish\ConformU64\*.exe"; DestDir: "{app}\64bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU64\*.dll"; DestDir: "{app}\64bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU64\*"; DestDir: "{app}\64bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU64\wwwroot\*"; DestDir: "{app}\64bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+Source: "..\publish\ConformU64\*.exe"; DestDir: "{app}\64bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
+Source: "..\publish\ConformU64\*.dll"; DestDir: "{app}\64bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
+Source: "..\publish\ConformU64\*"; DestDir: "{app}\64bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
+Source: "..\publish\ConformU64\wwwroot\*"; DestDir: "{app}\64bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
 
 ; 64bit OS - Install the 32bit app
-Source: "J:\ConformU\publish\ConformU86\*.exe"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\*"; DestDir: "{app}\32bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\wwwroot\*"; DestDir: "{app}\32bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+Source: "..\publish\ConformU86\*.exe"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
+Source: "..\publish\ConformU86\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
+Source: "..\publish\ConformU86\*"; DestDir: "{app}\32bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
+Source: "..\publish\ConformU86\wwwroot\*"; DestDir: "{app}\32bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
 
 ; 32bit OS - Install the 32bit app
-Source: "J:\ConformU\publish\ConformU86\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: not Is64BitInstallMode
-Source: "J:\ConformU\publish\ConformU86\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
+Source: "..\publish\ConformU86\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
+Source: "..\publish\ConformU86\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
+Source: "..\publish\ConformU86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: not Is64BitInstallMode
+Source: "..\publish\ConformU86\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
 
 [Icons]
 ; 64bit OS
diff --git a/publishWindows.cmd b/publishWindows.cmd
@@ -8,9 +8,9 @@ cd
 cd J:\ConformU
 
 echo *** Build application
-MSBuild "J:\ConformU\ConformU.sln" /p:Configuration=Debug /p:Platform="Any CPU" /t:Restore 
+MSBuild "ConformU.sln" /p:Configuration=Debug /p:Platform="Any CPU" /t:Restore 
 cd
-MSBuild "J:\ConformU\ConformU.sln" /p:Configuration=Debug /p:Platform="Any CPU" /t:Rebuild
+MSBuild "ConformU.sln" /p:Configuration=Debug /p:Platform="Any CPU" /t:Rebuild
 echo *** Completed Build
 
 echo *** Publishing Windows 64bit
@@ -26,7 +26,7 @@ echo *** Completed setting large address aware flag on 32bit EXE
 
 echo *** Creating Windows installer
 cd WindowsInstaller
-"C:\Program Files (x86)\Inno Script Studio\isstudio.exe" -compile "J:\ConformU\WindowsInstaller\conformu.iss"
+"C:\Program Files (x86)\Inno Script Studio\isstudio.exe" -compile "conformu.iss"
 cd ..
 
 echo *** Builds complete

Original file line number	Diff line number	Diff line change
`@@ -327,20 +327,26 @@ public override bool Connected`
`327`	`327`	`{`
`328`	`328`	`get`
`329`	`329`	`{`
`330`		`- if (settings.DisplayMethodCalls)`
`331`		`- LogTestAndMessage("ConformanceCheck", "About to get Connected");`
	`330`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`332`	`331`	`return camera.Connected;`
`333`	`332`	`}`
`334`	`333`	`set`
`335`	`334`	`{`
`336`		`- if (settings.DisplayMethodCalls)`
`337`		`- LogTestAndMessage("ConformanceCheck", "About to set Connected");`
	`335`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
`338`	`336`	`SetTest("Connected");`
`339`	`337`	`SetAction("Waiting for Connected to become 'true'");`
`340`	`338`	`camera.Connected = value;`
`341`	`339`	`ResetTestActionStatus();`
	`340`	`+`
	`341`	`+ // Make sure that the value set is reflected in Connected GET`
	`342`	`+ bool connectedState = Connected;`
	`343`	`+ if (connectedState != value)`
	`344`	`+ {`
	`345`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`346`	`+ }`
`342`	`347`	`}`
`343`	`348`	`}`
	`349`	`+`
`344`	`350`	`public override void ReadCanProperties()`
`345`	`351`	`{`
`346`	`352`	`// ICameraV1 properties`
Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,23 @@ public override bool Connected`
`173`	`173`	`{`
`174`	`174`	`get`
`175`	`175`	`{`
`176`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`176`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`177`	`177`	`return coverCalibratorDevice.Connected;`
`178`	`178`	`}`
`179`	`179`	`set`
`180`	`180`	`{`
`181`		`- LogCallToDriver("Connected", "About to set Connected property");`
	`181`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`182`	`+ SetTest("Connected");`
	`183`	`+ SetAction("Waiting for Connected to become 'true'");`
`182`	`184`	`coverCalibratorDevice.Connected = value;`
	`185`	`+ ResetTestActionStatus();`
	`186`	`+`
	`187`	`+ // Make sure that the value set is reflected in Connected GET`
	`188`	`+ bool connectedState = Connected;`
	`189`	`+ if (connectedState != value)`
	`190`	`+ {`
	`191`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`192`	`+ }`
`183`	`193`	`}`
`184`	`194`	`}`
`185`	`195`
Original file line number	Diff line number	Diff line change
`@@ -200,14 +200,23 @@ public override bool Connected`
`200`	`200`	`{`
`201`	`201`	`get`
`202`	`202`	`{`
`203`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`203`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`204`	`204`	`return domeDevice.Connected;`
`205`	`205`	`}`
`206`	`206`	`set`
`207`	`207`	`{`
`208`		`- LogCallToDriver("Connected", "About to set Connected property");`
	`208`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`209`	`+ SetTest("Connected");`
	`210`	`+ SetAction("Waiting for Connected to become 'true'");`
`209`	`211`	`domeDevice.Connected = value;`
	`212`	`+ ResetTestActionStatus();`
`210`	`213`
	`214`	`+ // Make sure that the value set is reflected in Connected GET`
	`215`	`+ bool connectedState = Connected;`
	`216`	`+ if (connectedState != value)`
	`217`	`+ {`
	`218`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`219`	`+ }`
`211`	`220`	`}`
`212`	`221`	`}`
`213`	`222`	`public override void CheckCommonMethods()`
Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,23 @@ public override bool Connected`
`151`	`151`	`{`
`152`	`152`	`get`
`153`	`153`	`{`
`154`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`154`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`155`	`155`	`return filterWheel.Connected;`
`156`	`156`	`}`
`157`	`157`	`set`
`158`	`158`	`{`
`159`		`- LogCallToDriver("Connected", "About to set Connected property");`
	`159`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`160`	`+ SetTest("Connected");`
	`161`	`+ SetAction("Waiting for Connected to become 'true'");`
`160`	`162`	`filterWheel.Connected = value;`
	`163`	`+ ResetTestActionStatus();`
	`164`	`+`
	`165`	`+ // Make sure that the value set is reflected in Connected GET`
	`166`	`+ bool connectedState = Connected;`
	`167`	`+ if (connectedState != value)`
	`168`	`+ {`
	`169`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`170`	`+ }`
`161`	`171`	`}`
`162`	`172`	`}`
`163`	`173`	`public override void PreRunCheck()`
Original file line number	Diff line number	Diff line change
`@@ -167,21 +167,22 @@ public override bool Connected`
`167`	`167`	`{`
`168`	`168`	`get`
`169`	`169`	`{`
`170`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`170`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`171`	`171`	`return focuser.Connected;`
`172`	`172`	`}`
`173`	`173`	`set`
`174`	`174`	`{`
`175`		`- try`
`176`		`- {`
`177`		`- LogDebug("Connected", "Setting connected state to: " + value.ToString());`
`178`		`- LogCallToDriver("Connected", "About to set Link property");`
`179`		`- focuser.Connected = value;`
`180`		`- LogDebug("AccessChecks", "Successfully changed connected state");`
`181`		`- }`
`182`		`- catch (Exception ex)`
	`175`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`176`	`+ SetTest("Connected");`
	`177`	`+ SetAction("Waiting for Connected to become 'true'");`
	`178`	`+ focuser.Connected = value;`
	`179`	`+ ResetTestActionStatus();`
	`180`	`+`
	`181`	`+ // Make sure that the value set is reflected in Connected GET`
	`182`	`+ bool connectedState = Connected;`
	`183`	`+ if (connectedState != value)`
`183`	`184`	`{`
`184`		`- LogIssue("Connected", "Error changing focuser connected state: " + ex.ToString());`
	`185`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,13 +235,23 @@ public override bool Connected`
`235`	`235`	`{`
`236`	`236`	`get`
`237`	`237`	`{`
`238`		`- LogCallToDriver("Absolute", "About to get Connected property");`
	`238`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`239`	`239`	`return m_ObservingConditions.Connected;`
`240`	`240`	`}`
`241`	`241`	`set`
`242`	`242`	`{`
`243`		`- LogCallToDriver("Absolute", "About to set Connected property");`
	`243`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`244`	`+ SetTest("Connected");`
	`245`	`+ SetAction("Waiting for Connected to become 'true'");`
`244`	`246`	`m_ObservingConditions.Connected = value;`
	`247`	`+ ResetTestActionStatus();`
	`248`	`+`
	`249`	`+ // Make sure that the value set is reflected in Connected GET`
	`250`	`+ bool connectedState = Connected;`
	`251`	`+ if (connectedState != value)`
	`252`	`+ {`
	`253`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`254`	`+ }`
`245`	`255`	`}`
`246`	`256`	`}`
`247`	`257`
Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,23 @@ public override bool Connected`
`178`	`178`	`{`
`179`	`179`	`get`
`180`	`180`	`{`
`181`		`- LogCallToDriver("Connected", "About to get Connected property");`
`182`		`- bool ConnectedRet = m_Rotator.Connected;`
`183`		`- return ConnectedRet;`
	`181`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
	`182`	`+ return m_Rotator.Connected;`
`184`	`183`	`}`
`185`		`-`
`186`	`184`	`set`
`187`	`185`	`{`
`188`		`- LogCallToDriver("Connected", "About to set Connected property");`
	`186`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`187`	`+ SetTest("Connected");`
	`188`	`+ SetAction("Waiting for Connected to become 'true'");`
`189`	`189`	`m_Rotator.Connected = value;`
	`190`	`+ ResetTestActionStatus();`
	`191`	`+`
	`192`	`+ // Make sure that the value set is reflected in Connected GET`
	`193`	`+ bool connectedState = Connected;`
	`194`	`+ if (connectedState != value)`
	`195`	`+ {`
	`196`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`197`	`+ }`
`190`	`198`	`}`
`191`	`199`	`}`
`192`	`200`
Original file line number	Diff line number	Diff line change
`@@ -179,13 +179,23 @@ public override bool Connected`
`179`	`179`	`{`
`180`	`180`	`get`
`181`	`181`	`{`
`182`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`182`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`183`	`183`	`return m_SafetyMonitor.Connected;`
`184`	`184`	`}`
`185`	`185`	`set`
`186`	`186`	`{`
`187`		`- LogCallToDriver("Connected", "About to set Connected property");`
	`187`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`188`	`+ SetTest("Connected");`
	`189`	`+ SetAction("Waiting for Connected to become 'true'");`
`188`	`190`	`m_SafetyMonitor.Connected = value;`
	`191`	`+ ResetTestActionStatus();`
	`192`	`+`
	`193`	`+ // Make sure that the value set is reflected in Connected GET`
	`194`	`+ bool connectedState = Connected;`
	`195`	`+ if (connectedState != value)`
	`196`	`+ {`
	`197`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`198`	`+ }`
`189`	`199`	`}`
`190`	`200`	`}`
`191`	`201`
Original file line number	Diff line number	Diff line change
`@@ -184,13 +184,23 @@ public override bool Connected`
`184`	`184`	`{`
`185`	`185`	`get`
`186`	`186`	`{`
`187`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`187`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
`188`	`188`	`return m_Switch.Connected;`
`189`	`189`	`}`
`190`	`190`	`set`
`191`	`191`	`{`
`192`		`- LogCallToDriver("Connected", "About to get Connected property");`
	`192`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`193`	`+ SetTest("Connected");`
	`194`	`+ SetAction("Waiting for Connected to become 'true'");`
`193`	`195`	`m_Switch.Connected = value;`
	`196`	`+ ResetTestActionStatus();`
	`197`	`+`
	`198`	`+ // Make sure that the value set is reflected in Connected GET`
	`199`	`+ bool connectedState = Connected;`
	`200`	`+ if (connectedState != value)`
	`201`	`+ {`
	`202`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`203`	`+ }`
`194`	`204`	`}`
`195`	`205`	`}`
`196`	`206`
Original file line number	Diff line number	Diff line change
`@@ -443,17 +443,23 @@ public override bool Connected`
`443`	`443`	`{`
`444`	`444`	`get`
`445`	`445`	`{`
`446`		`- if (settings.DisplayMethodCalls)`
`447`		`- LogTestAndMessage("ConformanceCheck", "About to get Connected property");`
`448`		`- bool ConnectedRet = telescopeDevice.Connected;`
`449`		`- return ConnectedRet;`
	`446`	`+ LogCallToDriver("ConformanceCheck", "About to get Connected");`
	`447`	`+ return telescopeDevice.Connected;`
`450`	`448`	`}`
`451`		`-`
`452`	`449`	`set`
`453`	`450`	`{`
`454`		`- if (settings.DisplayMethodCalls)`
`455`		`- LogTestAndMessage("ConformanceCheck", "About to set Connected property " + value.ToString());`
	`451`	`+ LogCallToDriver("ConformanceCheck", "About to set Connected");`
	`452`	`+ SetTest("Connected");`
	`453`	`+ SetAction("Waiting for Connected to become 'true'");`
`456`	`454`	`telescopeDevice.Connected = value;`
	`455`	`+ ResetTestActionStatus();`
	`456`	`+`
	`457`	`+ // Make sure that the value set is reflected in Connected GET`
	`458`	`+ bool connectedState = Connected;`
	`459`	`+ if (connectedState != value)`
	`460`	`+ {`
	`461`	`+ throw new ASCOM.InvalidOperationException($"Connected was set to {value} but Connected Get returned {connectedState}.");`
	`462`	`+ }`
`457`	`463`	`}`
`458`	`464`	`}`
`459`	`465`