From 556c747cb326a2cb80b1e8619f82a6f8cd131968 Mon Sep 17 00:00:00 2001 From: Matt Beanland Date: Wed, 6 May 2026 21:57:33 +0930 Subject: [PATCH] removed duplicate tests --- .../characteristic_test.exs | 9 ---- test/instance_extension/feature_test.exs | 13 ++--- .../instance_extension/specification_test.exs | 6 --- .../invalid/invalid_characteristic.ex | 44 ----------------- .../invalid/invalid_feature_characteristic.ex | 47 ------------------- .../resource/invalid/invalid_specification.ex | 40 ---------------- test/support/servo.ex | 18 ------- 7 files changed, 3 insertions(+), 174 deletions(-) delete mode 100644 test/support/resource/invalid/invalid_characteristic.ex delete mode 100644 test/support/resource/invalid/invalid_feature_characteristic.ex delete mode 100644 test/support/resource/invalid/invalid_specification.ex diff --git a/test/instance_extension/characteristic_test.exs b/test/instance_extension/characteristic_test.exs index 4748c28..ce2711c 100644 --- a/test/instance_extension/characteristic_test.exs +++ b/test/instance_extension/characteristic_test.exs @@ -5,7 +5,6 @@ defmodule Diffo.InstanceExtension.CharacteristicTest do @moduledoc false use ExUnit.Case - alias Diffo.Test.Servo alias Diffo.Test.Parties setup_all do @@ -19,14 +18,6 @@ defmodule Diffo.InstanceExtension.CharacteristicTest do end describe "characteristic" do - test "create resource fails when characteristic value type invalid" do - {:error, error} = Servo.build_invalid_characteristic(%{}) - %Ash.Error.Invalid{errors: errors} = error - - assert hd(errors).message == - "couldn't create characteristic with value of unknown type Elixir.InvalidValue" - end - test "create resource with array characteristic - success" do {:ok, shelf} = Parties.build_shelf_with_installer() diff --git a/test/instance_extension/feature_test.exs b/test/instance_extension/feature_test.exs index 84b778f..4c64946 100644 --- a/test/instance_extension/feature_test.exs +++ b/test/instance_extension/feature_test.exs @@ -5,7 +5,6 @@ defmodule Diffo.InstanceExtension.FeatureTest do @moduledoc false use ExUnit.Case - alias Diffo.Test.Servo alias Diffo.Test.Parties setup_all do @@ -19,19 +18,13 @@ defmodule Diffo.InstanceExtension.FeatureTest do end describe "feature" do - test "create resource with fails when feature characteristic value type invalid" do - {:error, error} = Servo.build_invalid_feature_characteristic(%{}) - %Ash.Error.Invalid{errors: errors} = error - - assert hd(errors).message == - "couldn't create feature characteristic with value of unknown type Elixir.InvalidValue" - end - test "create resource with array feature characteristic - success" do {:ok, shelf} = Parties.build_shelf_with_installer() spectral = Enum.find(shelf.features, fn f -> f.name == :spectralManagement end) - deployment_classes = Enum.find(spectral.characteristics, fn c -> c.name == :deploymentClasses end) + + deployment_classes = + Enum.find(spectral.characteristics, fn c -> c.name == :deploymentClasses end) assert deployment_classes.is_array == true assert deployment_classes.values == [] diff --git a/test/instance_extension/specification_test.exs b/test/instance_extension/specification_test.exs index 4a8d283..d1f4743 100644 --- a/test/instance_extension/specification_test.exs +++ b/test/instance_extension/specification_test.exs @@ -19,12 +19,6 @@ defmodule Diffo.InstanceExtension.SpecificationTest do end describe "specification" do - test "create resource fails when specification id not uuid v4" do - {:error, error} = Servo.build_invalid_specification(%{}) - %Ash.Error.Invalid{errors: errors} = error - assert hd(errors).message == "must be a uuid v4 or nil" - end - test "description declared in specification DSL roundtrips to the persisted specification" do spec_id = Shelf.specification()[:id] description = Shelf.specification()[:description] diff --git a/test/support/resource/invalid/invalid_characteristic.ex b/test/support/resource/invalid/invalid_characteristic.ex deleted file mode 100644 index 2053dba..0000000 --- a/test/support/resource/invalid/invalid_characteristic.ex +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: 2025 diffo contributors -# -# SPDX-License-Identifier: MIT - -defmodule Diffo.Test.InvalidCharacteristic do - @moduledoc """ - Diffo - TMF Service and Resource Management with a difference - - InvalidCharacteristic - Resource Instance with an Invalid Characteristic - """ - - alias Diffo.Provider.BaseInstance - - use Ash.Resource, - fragments: [BaseInstance], - domain: Diffo.Test.Servo - - resource do - description "Ash Resource with an invalid characteristic" - end - - structure do - specification do - id "3caf29b9-0b91-4b8f-8568-2960131b1feb" - name "invalidCharacteristic" - type :resourceSpecification - category "Network Resource" - end - - characteristics do - characteristic :invalid, InvalidValue - end - end - - actions do - create :build do - description "creates a new InvalidCharacteristic resource instance for build" - accept [:id, :name, :type, :which] - change set_attribute(:type, :resource) - change load [:href] - upsert? false - end - end -end diff --git a/test/support/resource/invalid/invalid_feature_characteristic.ex b/test/support/resource/invalid/invalid_feature_characteristic.ex deleted file mode 100644 index 143b717..0000000 --- a/test/support/resource/invalid/invalid_feature_characteristic.ex +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-FileCopyrightText: 2025 diffo contributors -# -# SPDX-License-Identifier: MIT - -defmodule Diffo.Test.InvalidFeatureCharacteristic do - @moduledoc """ - Diffo - TMF Service and Resource Management with a difference - - InvalidFeatureCharacteristic - Resource Instance with an Invalid Feature Characteristic - """ - - alias Diffo.Provider.BaseInstance - - use Ash.Resource, - fragments: [BaseInstance], - domain: Diffo.Test.Servo - - resource do - description "Ash Resource with an invalid feature characteristic" - end - - structure do - specification do - id "1f2402ca-82da-428e-a58b-5405a5431386" - name "invalidFeatureCharacteristic" - type :resourceSpecification - category "Network Resource" - end - - features do - feature :invalid_feature_characteristic do - is_enabled? true - characteristic :invalid, InvalidValue - end - end - end - - actions do - create :build do - description "creates a new InvalidFeatureCharacteristic resource instance for build" - accept [:id, :name, :type, :which] - change set_attribute(:type, :resource) - change load [:href] - upsert? false - end - end -end diff --git a/test/support/resource/invalid/invalid_specification.ex b/test/support/resource/invalid/invalid_specification.ex deleted file mode 100644 index b409619..0000000 --- a/test/support/resource/invalid/invalid_specification.ex +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-FileCopyrightText: 2025 diffo contributors -# -# SPDX-License-Identifier: MIT - -defmodule Diffo.Test.InvalidSpecification do - @moduledoc """ - Diffo - TMF Service and Resource Management with a difference - - InvalidSpecification - Resource Instance with an Invalid Specification - """ - - alias Diffo.Provider.BaseInstance - - use Ash.Resource, - fragments: [BaseInstance], - domain: Diffo.Test.Servo - - resource do - description "Ash Resource with an invalid specification" - end - - structure do - specification do - id "ef016d85-9dbd-429c-04da-1df56cc7dda5" - name "invalidSpecification" - type :resourceSpecification - category "Network Resource" - end - end - - actions do - create :build do - description "creates a new InvalidSpecification resource instance for build" - accept [:id, :name, :type, :which] - change set_attribute(:type, :resource) - change load [:href] - upsert? false - end - end -end diff --git a/test/support/servo.ex b/test/support/servo.ex index ad9c0d6..0121a5b 100644 --- a/test/support/servo.ex +++ b/test/support/servo.ex @@ -16,9 +16,6 @@ defmodule Diffo.Test.Servo do alias Diffo.Test.Card alias Diffo.Test.Broadband alias Diffo.Test.BroadbandV2 - alias Diffo.Test.InvalidSpecification - alias Diffo.Test.InvalidCharacteristic - alias Diffo.Test.InvalidFeatureCharacteristic domain do description "service and resource management" @@ -50,20 +47,5 @@ defmodule Diffo.Test.Servo do define :build_broadband_v2, action: :build define :get_broadband_v2_by_id, action: :read, get_by: :id end - - resource InvalidSpecification do - define :get_invalid_specification_by_id, action: :read, get_by: :id - define :build_invalid_specification, action: :build - end - - resource InvalidCharacteristic do - define :get_invalid_characteristic_by_id, action: :read, get_by: :id - define :build_invalid_characteristic, action: :build - end - - resource InvalidFeatureCharacteristic do - define :get_invalid_feature_characteristic_by_id, action: :read, get_by: :id - define :build_invalid_feature_characteristic, action: :build - end end end