From a982989fd80ea4e247cc5d997902df90c2a5c096 Mon Sep 17 00:00:00 2001
From: Alden Hilton <adhilto@sandia.gov>
Date: Mon, 15 Jan 2024 17:36:38 -0800
Subject: [PATCH] Removed the old 1.2 and 3.2

---
 .../RegoTests/calendar/calendar01_test.rego   | 24 +----------------
 .../RegoTests/calendar/calendar03_test.rego   | 24 +----------------
 rego/Calendar.rego                            | 27 -------------------
 3 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/Testing/RegoTests/calendar/calendar01_test.rego b/Testing/RegoTests/calendar/calendar01_test.rego
index fbff9263..2f375ef2 100644
--- a/Testing/RegoTests/calendar/calendar01_test.rego
+++ b/Testing/RegoTests/calendar/calendar01_test.rego
@@ -2,7 +2,7 @@ package calendar
 import future.keywords
 
 #
-# Policy 1
+# GWS.CALENDAR.1.1v0.1
 #--
 test_ExtSharingPrimaryCal_Correct_V1 if {
     # Test external sharing for primary calendars when there's only one event
@@ -391,26 +391,4 @@ test_ExtSharingPrimaryCal_Incorrect_V5 if {
     not RuleOutput[0].NoSuchEvent
     RuleOutput[0].ReportDetails == "Requirement failed in Secondary OU."
 }
-
-#
-# GWS.CALENDAR.1.2v0.1
-#--
-
-test_External_Sharing_Options_V1 if {
-    # Not-Implemented
-    PolicyId := "GWS.CALENDAR.1.2v0.1"
-    Output := tests with input as {
-        "calendar_logs": {"items": [
-        ]},
-        "tenant_info": {
-            "topLevelOU": "Test Top-Level OU"
-        }
-    }
-
-    RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
-    count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
-    RuleOutput[0].NoSuchEvent
-    RuleOutput[0].ReportDetails == "Currently not able to be tested automatically; please manually check."
-}
 #--
\ No newline at end of file
diff --git a/Testing/RegoTests/calendar/calendar03_test.rego b/Testing/RegoTests/calendar/calendar03_test.rego
index 060d701b..3b1de973 100644
--- a/Testing/RegoTests/calendar/calendar03_test.rego
+++ b/Testing/RegoTests/calendar/calendar03_test.rego
@@ -2,7 +2,7 @@ package calendar
 import future.keywords
 
 #
-# Policy 1
+# GWS.CALENDAR.3.1v0.1
 #--
 test_ExtSharingSecondaryCal_Correct_V1 if {
  # Test external sharing for secondary calendars when there's only one event
@@ -186,26 +186,4 @@ test_ExtSharingSecondaryCal_Incorrect_V3 if {
         " is shared outside Test Top-Level Domain but outsiders cannot change calendars."
     ])
 }
-
-#
-# GWS.CALENDAR.3.2v0.1
-#--
-
-test_ExternalSharingOptions_Secondary__Correct_V1 if {
-    # Not-Implemented
-    PolicyId := "GWS.CALENDAR.3.2v0.1"
-    Output := tests with input as {
-        "calendar_logs": {"items": [
-        ]},
-        "tenant_info": {
-            "topLevelOU": "Test Top-Level OU"
-        }
-    }
-
-    RuleOutput := [Result | some Result in Output; Result.PolicyId == PolicyId]
-    count(RuleOutput) == 1
-    not RuleOutput[0].RequirementMet
-    RuleOutput[0].NoSuchEvent
-    RuleOutput[0].ReportDetails == "Currently not able to be tested automatically; please manually check."
-}
 #--
\ No newline at end of file
diff --git a/rego/Calendar.rego b/rego/Calendar.rego
index 12255e72..f239af0f 100644
--- a/rego/Calendar.rego
+++ b/rego/Calendar.rego
@@ -53,19 +53,6 @@ if {
 }
 #--
 
-#
-# Baseline GWS.CALENDAR.1.2v0.1
-#--
-tests contains {
-    "PolicyId": "GWS.CALENDAR.1.2v0.1",
-    "Criticality": "May/Not-Implemented",
-    "ReportDetails": "Currently not able to be tested automatically; please manually check.",
-    "ActualValue": "",
-    "RequirementMet": false,
-    "NoSuchEvent": true
-}
-#--
-
 ##################
 # GWS.CALENDAR.2 #
 ##################
@@ -186,20 +173,6 @@ if {
 }
 #--
 
-#
-# Baseline GWS.CALENDAR.3.2v0.1
-#--
-tests contains {
-    "PolicyId": "GWS.CALENDAR.3.2v0.1",
-    "Criticality": "May/Not-Implemented",
-    "ReportDetails": "Currently not able to be tested automatically; please manually check.",
-    "ActualValue": "",
-    "RequirementMet": false,
-    "NoSuchEvent": true
-}
-#--
-
-
 
 ##################
 # GWS.CALENDAR.4 #