[#328] Default Safe variable is incorrect in many cases (#343)

* defaultSafe ticket #328 * [#328] Fix 14.1 * [#328] Update Meet 4.1 * [#328] Fixed unit tests for Calendar * [#328] Unit tests for Chat fixed * [#328] Classroom unit tests fixed * [#328] CommonCnotrols unit tests fixed * [#328] Drive unit tests fixed * [#328] Gmail unit tests updated * [#328] Last unit test in Gmail fixed * [#328] Groups unit tests fixed * [#328] Meet unit tests updated * [#328] Meet last unit test fixed * [#328] PR updates * [#328] Removed extra white space --------- Co-authored-by: Annie ORourke <[email protected]>
cisagov · Aug 21, 2024 · 2e00bf2 · 2e00bf2
1 parent 9eec6e8
commit 2e00bf2
Show file tree

Hide file tree

Showing 36 changed files with 156 additions and 159 deletions.
diff --git a/Testing/RegoTests/calendar/calendar01_test.rego b/Testing/RegoTests/calendar/calendar01_test.rego
@@ -280,12 +280,12 @@ test_ExtSharingPrimaryCal_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 
@@ -387,12 +387,12 @@ test_ExtSharingPrimaryCal_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 

diff --git a/Testing/RegoTests/calendar/calendar02_test.rego b/Testing/RegoTests/calendar/calendar02_test.rego
@@ -188,12 +188,12 @@ test_ExtInvitationsWarning_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 
@@ -295,12 +295,12 @@ test_ExtInvitationsWarning_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 

diff --git a/Testing/RegoTests/calendar/calendar03_test.rego b/Testing/RegoTests/calendar/calendar03_test.rego
@@ -100,12 +100,12 @@ test_CalInteropMan_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 

diff --git a/Testing/RegoTests/calendar/calendar04_test.rego b/Testing/RegoTests/calendar/calendar04_test.rego
@@ -131,12 +131,12 @@ test_CalendarAppointmentSlot_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 

diff --git a/Testing/RegoTests/chat/chat01_test.rego b/Testing/RegoTests/chat/chat01_test.rego
@@ -228,12 +228,12 @@ test_History_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 
@@ -328,12 +328,12 @@ test_History_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 #--

diff --git a/Testing/RegoTests/chat/chat03_test.rego b/Testing/RegoTests/chat/chat03_test.rego
@@ -159,12 +159,12 @@ test_Space_History_Setting_Incorrect_V1 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 
@@ -327,12 +327,12 @@ test_Space_History_Setting_Incorrect_V6 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 

diff --git a/Testing/RegoTests/classroom/classroom01_test.rego b/Testing/RegoTests/classroom/classroom01_test.rego
@@ -175,12 +175,12 @@ test_JoinClassroom_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
 #--
@@ -359,11 +359,11 @@ test_WhichClasses_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }
diff --git a/Testing/RegoTests/classroom/classroom04_test.rego b/Testing/RegoTests/classroom/classroom04_test.rego
@@ -262,12 +262,12 @@ test_UnenrollStudents_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    RuleOutput[0].RequirementMet
+    not RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is compliant; manual check recommended."
+        "is non-compliant; manual check recommended."
     ])
 }
 test_UnenrollStudents_Incorrect_V4 if {
@@ -335,12 +335,12 @@ test_UnenrollStudents_Incorrect_V5 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    RuleOutput[0].RequirementMet
+    not RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is compliant; manual check recommended."
+        "is non-compliant; manual check recommended."
     ])
 }
 
@@ -481,12 +481,12 @@ test_UnenrollStudents_Incorrect_V9 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    RuleOutput[0].RequirementMet
+    not RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, Test Top-Level OU. ",
         "While we are unable to determine the state from the logs, the default setting ",
-        "is compliant; manual check recommended."
+        "is non-compliant; manual check recommended."
     ])
 }
 #--
diff --git a/Testing/RegoTests/commoncontrols/commoncontrols05_test.rego b/Testing/RegoTests/commoncontrols/commoncontrols05_test.rego
@@ -216,13 +216,13 @@ test_Strength_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Strength_Incorrect_V4 if {
@@ -249,13 +249,13 @@ test_Strength_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Strength_Incorrect_V5 if {
@@ -1025,13 +1025,13 @@ test_Reuse_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Reuse_Incorrect_V4 if {
@@ -1058,13 +1058,13 @@ test_Reuse_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Reuse_Incorrect_V5 if {
@@ -1276,13 +1276,13 @@ test_Expire_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Expire_Incorrect_V4 if {
@@ -1309,13 +1309,13 @@ test_Expire_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Expire_Incorrect_V5 if {

diff --git a/Testing/RegoTests/commoncontrols/commoncontrols11_test.rego b/Testing/RegoTests/commoncontrols/commoncontrols11_test.rego
@@ -662,13 +662,13 @@ test_Access_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Access_Incorrect_V4 if {
@@ -694,13 +694,13 @@ test_Access_Incorrect_V4 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])}
 
 test_Access_Incorrect_V5 if {

diff --git a/Testing/RegoTests/commoncontrols/commoncontrols15_test.rego b/Testing/RegoTests/commoncontrols/commoncontrols15_test.rego
@@ -182,13 +182,13 @@ test_Logs_Incorrect_V3 if {
 
     RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
     count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
+    RuleOutput[0].RequirementMet
     RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == concat("", [
         "No relevant event in the current logs for the top-level OU, ",
         "Test Top-Level OU. While we are unable ",
         "to determine the state from the logs, the default setting ",
-        "is non-compliant; manual check recommended."
+        "is compliant; manual check recommended."
     ])
 }