Refs: #4267@0.45h;

- setting up a CCCLD subdir struct for CCCLD related tests
- removed all occcurances of `@@default_criticity`

45 files changed, 8 insertions, 26 deletions

diff --git a/app/models/journey_pattern_control/duplicates.rb b/app/models/journey_pattern_control/duplicates.rb
index d3908cfc0..e988fbcc5 100644
--- a/app/models/journey_pattern_control/duplicates.rb
+++ b/app/models/journey_pattern_control/duplicates.rb
@@ -1,7 +1,6 @@
 module JourneyPatternControl
   class Duplicates < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-1"
   end
 end
diff --git a/app/models/journey_pattern_control/vehicle_journey.rb b/app/models/journey_pattern_control/vehicle_journey.rb
index d7151f147..cf8bdf7e8 100644
--- a/app/models/journey_pattern_control/vehicle_journey.rb
+++ b/app/models/journey_pattern_control/vehicle_journey.rb
@@ -1,7 +1,6 @@
 module JourneyPatternControl
   class VehicleJourney < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-2"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index 21c5eca06..f16cad8d4 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -1,7 +1,6 @@
 module LineControl
   class Route < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Line-1"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/duplicates.rb b/app/models/route_control/duplicates.rb
index fb9c34e0a..b57b3241b 100644
--- a/app/models/route_control/duplicates.rb
+++ b/app/models/route_control/duplicates.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class Duplicates < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-4"
   end
 end
diff --git a/app/models/route_control/journey_pattern.rb b/app/models/route_control/journey_pattern.rb
index 08f603d8f..0a26322e0 100644
--- a/app/models/route_control/journey_pattern.rb
+++ b/app/models/route_control/journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class JourneyPattern < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-3"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb
index f42b88748..aec8c7a3f 100644
--- a/app/models/route_control/minimum_length.rb
+++ b/app/models/route_control/minimum_length.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class MinimumLength < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-6"
   end
 end
diff --git a/app/models/route_control/omnibus_journey_pattern.rb b/app/models/route_control/omnibus_journey_pattern.rb
index 3b9f6d06f..8cc91e4e4 100644
--- a/app/models/route_control/omnibus_journey_pattern.rb
+++ b/app/models/route_control/omnibus_journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OmnibusJourneyPattern < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-9"
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index e91b081e2..9a168cfc5 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OppositeRoute < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-2"
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index fd62b7684..c791ae385 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OppositeRouteTerminus < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-5"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index 0a2b6ac76..84d892c70 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -3,7 +3,6 @@ module VehicleJourneyControl
 
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-2"
   end
 end
diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb
index dced6c005..48a66298d 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class StopPointInJourneyPattern < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-6"
   end
 end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 5d0f21b40..1153a5269 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class TimeTable < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-VehicleJourney-4"
   end
 end
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index dee846cbb..b7276baaf 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class UnactivatedStopPoint < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-10"
   end
 end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index 149282fe6..e1c0e8c6b 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class VehicleJourneyAtStops < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-VehicleJourney-5"
   end
 end
diff --git a/app/models/route_control/zdl_stop_area.rb b/app/models/route_control/zdl_stop_area.rb
index 088a1d2f2..49a5ad56f 100644
--- a/app/models/route_control/zdl_stop_area.rb
+++ b/app/models/route_control/zdl_stop_area.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class ZDLStopArea < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-1"
   end
 end
diff --git a/app/models/routing_constaint_zone_control/maximum_length.rb b/app/models/routing_constaint_zone_control/maximum_length.rb
index 4d289de63..cb04c6806 100644
--- a/app/models/routing_constaint_zone_control/maximum_length.rb
+++ b/app/models/routing_constaint_zone_control/maximum_length.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class MaximumLength < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-2"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/routing_constaint_zone_control/minimum_length.rb b/app/models/routing_constaint_zone_control/minimum_length.rb
index 28f0791a7..7b510131b 100644
--- a/app/models/routing_constaint_zone_control/minimum_length.rb
+++ b/app/models/routing_constaint_zone_control/minimum_length.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class MinimumLength < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-3"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
index fe5381a34..6efa384a2 100644
--- a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
+++ b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class UnactivatedStopPoint < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-1"
   end
 end
diff --git a/app/models/vechicle_journey_control/delta.rb b/app/models/vechicle_journey_control/delta.rb
index d77eff48a..c90e05abd 100644
--- a/app/models/vechicle_journey_control/delta.rb
+++ b/app/models/vechicle_journey_control/delta.rb
@@ -3,7 +3,6 @@ module VehicleJourneyControl
 
     hstore_accessor :control_attributes, delta: :integer
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-3"
   end
 end
diff --git a/app/models/vechicle_journey_control/waiting_time.rb b/app/models/vechicle_journey_control/waiting_time.rb
index cbffa5526..9f4192520 100644
--- a/app/models/vechicle_journey_control/waiting_time.rb
+++ b/app/models/vechicle_journey_control/waiting_time.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class WatingTime < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-1"
   end
 end
diff --git a/spec/models/generic_attribute_control/min_max_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb
index 0f020db89..0f020db89 100644
--- a/spec/models/generic_attribute_control/min_max_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb
diff --git a/spec/models/generic_attribute_control/parent_class_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/parent_class_cccld_spec.rb
index f9c4373d5..f9c4373d5 100644
--- a/spec/models/generic_attribute_control/parent_class_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/parent_class_cccld_spec.rb
diff --git a/spec/models/generic_attribute_control/pattern_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
index db2ded2a9..db2ded2a9 100644
--- a/spec/models/generic_attribute_control/pattern_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
diff --git a/spec/models/generic_attribute_control/uniqueness_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb
index e81ad26cd..e81ad26cd 100644
--- a/spec/models/generic_attribute_control/uniqueness_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/delta_cccdl_spec.rb
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccdl_spec.rb
diff --git a/spec/support/shared_examples/compliance_control_class_level_defaults.rb b/spec/support/shared_examples/compliance_control_class_level_defaults.rb
index d433038fc..276ac1ca5 100644
--- a/spec/support/shared_examples/compliance_control_class_level_defaults.rb
+++ b/spec/support/shared_examples/compliance_control_class_level_defaults.rb
@@ -1,3 +1,5 @@
+require_relative '../data_modifier'
+
 H = Support::DataModifier::Hash
 RSpec.shared_examples_for 'ComplianceControl Class Level Defaults' do
     context 'class attributes' do