From 98d4e62d3e2f065e4b9e13b0637d36f7596d3800 Mon Sep 17 00:00:00 2001
From: jowensoc <114502866+jowensoc@users.noreply.github.com>
Date: Wed, 29 Jul 2026 12:36:03 +0100
Subject: [PATCH 1/5] wip

---
 .../services/TaxDescriptionService.scala      | 39 ++++++++
 conf/messages.en                              | 20 ++++
 .../services/TaxDescriptionServiceSpec.scala  | 94 +++++++++++++++++++
 3 files changed, 153 insertions(+)
 create mode 100644 app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
 create mode 100644 conf/messages.en
 create mode 100644 test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala

diff --git a/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala b/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
new file mode 100644
index 0000000..0fd167b
--- /dev/null
+++ b/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2026 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.corporationtax.services
+
+import uk.gov.hmrc.http.HeaderCarrier
+import javax.inject.Inject
+import scala.concurrent.Future
+
+class TaxDescriptionService @Inject() {
+
+  def getTaxDescription(assessmentType: String, correctionClaim: String)(implicit hc: HeaderCarrier): Future[String] = {
+    Future.successful {
+      val messageType = correctionClaim match {
+        case "0" => "standard"
+        case "2" => "claim"
+        case _ => "standard"
+      }
+
+      val message = s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType";
+      val result = message
+
+      result
+    }
+  }
+}
diff --git a/conf/messages.en b/conf/messages.en
new file mode 100644
index 0000000..3ad51ec
--- /dev/null
+++ b/conf/messages.en
@@ -0,0 +1,20 @@
+taxDescription.assessment.a.standard = Amended assessment
+taxDescription.assessment.a.claim = Amended assessment (claim)
+taxDescription.assessment.d.standard = Discovery assessment
+taxDescription.assessment.d.claim = Discovery assessment (claim)
+taxDescription.assessment.e.standard = HMRC determination
+taxDescription.assessment.e.claim = HMRC determination (claim)
+taxDescription.assessment.f.standard = Further assessment
+taxDescription.assessment.f.claim = Further assessment (claim)
+taxDescription.assessment.j.standard = HMRC amended self assessment
+taxDescription.assessment.j.claim = HMRC amended self assessment (claim)
+taxDescription.assessment.m.standard = Main assessment
+taxDescription.assessment.m.claim = Main assessment (claim)
+taxDescription.assessment.r.standard = HMRC amended self assessment
+taxDescription.assessment.r.claim = HMRC amended self assessment (claim)
+taxDescription.assessment.s.standard = Self assessment
+taxDescription.assessment.s.claim = Self assessment (claim)
+taxDescription.assessment.t.standard = Taxpayer amended self assessment
+taxDescription.assessment.t.claim = Taxpayer amended self assessment (claim)
+taxDescription.assessment.z.standard = Return charge
+taxDescription.assessment.z.claim = Return charge (claim)
\ No newline at end of file
diff --git a/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala b/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala
new file mode 100644
index 0000000..65c74ac
--- /dev/null
+++ b/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2026 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.corporationtax.Services
+
+import org.scalatest.Inspectors.forAll
+import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.prop.Tables.Table
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatestplus.mockito.MockitoSugar
+import uk.gov.hmrc.corporationtax.services.TaxDescriptionService
+import uk.gov.hmrc.http.HeaderCarrier
+import scala.concurrent.ExecutionContext
+
+class TaxDescriptionServiceSpec extends AnyWordSpec with Matchers with ScalaFutures with MockitoSugar {
+  implicit val hc: HeaderCarrier    = HeaderCarrier()
+  implicit val ec: ExecutionContext = ExecutionContext.global
+
+  private val parametersTable = Table(
+    "A",
+    "D",
+    "E",
+    "F",
+    "J",
+    "M",
+    "R",
+    "S",
+    "T",
+    "Z"
+  )
+
+  private class Setup {
+    val service = new TaxDescriptionService()
+  }
+
+  it should "check all assessment types" {
+    forAll(parametersTable) { assessmentType =>
+      s"Assessment Type is $assessmentType, it should return correct Tax Description" should {
+        "when Correction Claim Indicator is null" in new Setup {
+          val result: String = service.getTaxDescription(assessmentType, null).futureValue
+
+          result mustBe "dummy text"
+        }
+
+        "when Correction Claim Indicator is 0" in new Setup {
+          val result: String = service.getTaxDescription(assessmentType, "0").futureValue
+
+          result mustBe "dummy text"
+        }
+
+        "when Correction Claim Indicator is 2" in new Setup {
+          val result: String = service.getTaxDescription(assessmentType, "2").futureValue
+
+          result mustBe "dummy text"
+        }
+      }
+    }
+  }
+
+//  "Assessment Type is A, it should return correct Tax Description" should {
+//    "when Correction Claim Indicator is null" in new Setup {
+//      val result: String = service.getTaxDescription("A", null).futureValue
+//
+//      result mustBe "dummy text"
+//    }
+//
+//    "when Correction Claim Indicator is 0" in new Setup {
+//      val result: String = service.getTaxDescription("A", "0").futureValue
+//
+//      result mustBe "dummy text"
+//    }
+//
+//    "when Correction Claim Indicator is 2" in new Setup {
+//      val result: String = service.getTaxDescription("A", "2").futureValue
+//
+//      result mustBe "dummy text"
+//    }
+//  }
+
+}

From a8f391cb5370b53e1232200466a1bdc1885d25ee Mon Sep 17 00:00:00 2001
From: jowensoc <114502866+jowensoc@users.noreply.github.com>
Date: Thu, 30 Jul 2026 15:52:59 +0100
Subject: [PATCH 2/5] DTR-6378: refactored service into helper file

---
 .../services/TaxDescriptionService.scala      | 39 --------
 .../utils/TaxDescriptionHelper.scala          | 21 +++++
 .../services/TaxDescriptionServiceSpec.scala  | 94 -------------------
 .../utils/TaxDescriptionHelperSpec.scala      | 73 ++++++++++++++
 4 files changed, 94 insertions(+), 133 deletions(-)
 delete mode 100644 app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
 create mode 100644 app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
 delete mode 100644 test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala
 create mode 100644 test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala

diff --git a/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala b/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
deleted file mode 100644
index 0fd167b..0000000
--- a/app/uk/gov/hmrc/corporationtax/services/TaxDescriptionService.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2026 HM Revenue & Customs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.hmrc.corporationtax.services
-
-import uk.gov.hmrc.http.HeaderCarrier
-import javax.inject.Inject
-import scala.concurrent.Future
-
-class TaxDescriptionService @Inject() {
-
-  def getTaxDescription(assessmentType: String, correctionClaim: String)(implicit hc: HeaderCarrier): Future[String] = {
-    Future.successful {
-      val messageType = correctionClaim match {
-        case "0" => "standard"
-        case "2" => "claim"
-        case _ => "standard"
-      }
-
-      val message = s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType";
-      val result = message
-
-      result
-    }
-  }
-}
diff --git a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
new file mode 100644
index 0000000..9b7a038
--- /dev/null
+++ b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
@@ -0,0 +1,21 @@
+package uk.gov.hmrc.corporationtax.utils
+
+import scala.concurrent.Future
+
+class TaxDescriptionHelper {
+
+  def getTaxDescription(assessmentType: String, correctionClaim: String): Future[String] = {
+    Future.successful {
+      val messageType = correctionClaim match {
+        case "0" => "standard"
+        case "2" => "claim"
+        case _ => "standard"
+      }
+      
+      val result = s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType";
+      
+      result
+    }
+  }
+
+}
diff --git a/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala b/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala
deleted file mode 100644
index 65c74ac..0000000
--- a/test/uk/gov/hmrc/corporationtax/services/TaxDescriptionServiceSpec.scala
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2026 HM Revenue & Customs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package uk.gov.hmrc.corporationtax.Services
-
-import org.scalatest.Inspectors.forAll
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.matchers.must.Matchers
-import org.scalatest.prop.Tables.Table
-import org.scalatest.wordspec.AnyWordSpec
-import org.scalatestplus.mockito.MockitoSugar
-import uk.gov.hmrc.corporationtax.services.TaxDescriptionService
-import uk.gov.hmrc.http.HeaderCarrier
-import scala.concurrent.ExecutionContext
-
-class TaxDescriptionServiceSpec extends AnyWordSpec with Matchers with ScalaFutures with MockitoSugar {
-  implicit val hc: HeaderCarrier    = HeaderCarrier()
-  implicit val ec: ExecutionContext = ExecutionContext.global
-
-  private val parametersTable = Table(
-    "A",
-    "D",
-    "E",
-    "F",
-    "J",
-    "M",
-    "R",
-    "S",
-    "T",
-    "Z"
-  )
-
-  private class Setup {
-    val service = new TaxDescriptionService()
-  }
-
-  it should "check all assessment types" {
-    forAll(parametersTable) { assessmentType =>
-      s"Assessment Type is $assessmentType, it should return correct Tax Description" should {
-        "when Correction Claim Indicator is null" in new Setup {
-          val result: String = service.getTaxDescription(assessmentType, null).futureValue
-
-          result mustBe "dummy text"
-        }
-
-        "when Correction Claim Indicator is 0" in new Setup {
-          val result: String = service.getTaxDescription(assessmentType, "0").futureValue
-
-          result mustBe "dummy text"
-        }
-
-        "when Correction Claim Indicator is 2" in new Setup {
-          val result: String = service.getTaxDescription(assessmentType, "2").futureValue
-
-          result mustBe "dummy text"
-        }
-      }
-    }
-  }
-
-//  "Assessment Type is A, it should return correct Tax Description" should {
-//    "when Correction Claim Indicator is null" in new Setup {
-//      val result: String = service.getTaxDescription("A", null).futureValue
-//
-//      result mustBe "dummy text"
-//    }
-//
-//    "when Correction Claim Indicator is 0" in new Setup {
-//      val result: String = service.getTaxDescription("A", "0").futureValue
-//
-//      result mustBe "dummy text"
-//    }
-//
-//    "when Correction Claim Indicator is 2" in new Setup {
-//      val result: String = service.getTaxDescription("A", "2").futureValue
-//
-//      result mustBe "dummy text"
-//    }
-//  }
-
-}
diff --git a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
new file mode 100644
index 0000000..00f290b
--- /dev/null
+++ b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2026 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.corporationtax.utils
+
+import org.scalatest.Inspectors.forAll
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.prop.Tables.Table
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatest.concurrent.ScalaFutures
+
+class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutures {
+
+  private val parametersTable = Table(
+    ("A"),
+    ("D"),
+    ("E"),
+    ("F"),
+    ("J"),
+    ("M"),
+    ("R"),
+    ("S"),
+    ("T"),
+    ("Z")
+  )
+
+  private val taxDescriptionHelper = new TaxDescriptionHelper();
+
+  "TaxDescriptionHelper" should {
+    forAll(parametersTable) { assessmentType =>
+      s"Assessment Type is $assessmentType, it should return correct Tax Description" should {
+
+        "when Correction Claim Indicator is null" in {
+          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+
+          result mustBe expectedResult
+        }
+
+        "when Correction Claim Indicator is 0" in {
+          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+
+          result mustBe expectedResult
+        }
+
+        "when Correction Claim Indicator is 2" in {
+          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+
+          result mustBe expectedResult
+        }
+      }
+    }
+  }
+
+}

From 5601a079ddc0087d099c6a3afce89f911279522a Mon Sep 17 00:00:00 2001
From: jowensoc <114502866+jowensoc@users.noreply.github.com>
Date: Fri, 31 Jul 2026 09:01:19 +0100
Subject: [PATCH 3/5] DTR-6378: Created mock messages

---
 .../utils/TaxDescriptionHelper.scala          |  6 +-
 .../utils/TaxDescriptionHelperSpec.scala      | 67 ++++++++++++++++---
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
index 9b7a038..27d4e3d 100644
--- a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
+++ b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
@@ -1,10 +1,12 @@
 package uk.gov.hmrc.corporationtax.utils
 
+import play.api.i18n.Messages
+
 import scala.concurrent.Future
 
 class TaxDescriptionHelper {
 
-  def getTaxDescription(assessmentType: String, correctionClaim: String): Future[String] = {
+  def getTaxDescription(assessmentType: String, correctionClaim: String)(implicit messages: Messages): Future[String] = {
     Future.successful {
       val messageType = correctionClaim match {
         case "0" => "standard"
@@ -12,7 +14,7 @@ class TaxDescriptionHelper {
         case _ => "standard"
       }
       
-      val result = s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType";
+      val result = messages(s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType");
       
       result
     }
diff --git a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
index 00f290b..4a1278b 100644
--- a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
+++ b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
@@ -21,22 +21,63 @@ import org.scalatest.matchers.must.Matchers
 import org.scalatest.prop.Tables.Table
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.concurrent.ScalaFutures
+import play.api.i18n.{DefaultMessagesApi, Lang, Messages}
 
 class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutures {
 
+//  private val parametersTable = Table(
+//    ("A"),
+//    ("D"),
+//    ("E"),
+//    ("F"),
+//    ("J"),
+//    ("M"),
+//    ("R"),
+//    ("S"),
+//    ("T"),
+//    ("Z")
+//  )
+
   private val parametersTable = Table(
-    ("A"),
-    ("D"),
-    ("E"),
-    ("F"),
-    ("J"),
-    ("M"),
-    ("R"),
-    ("S"),
-    ("T"),
-    ("Z")
+    ("A", "Amended assessment", "Amended assessment (claim)"),
+    ("D", "Discovery assessment", "Discovery assessment (claim)"),
+    ("E", "HMRC determination", "HMRC determination (claim)"),
+    ("F", "Further assessment", "Further assessment (claim)"),
+    ("J", "HMRC amended self assessment", "HMRC amended self assessment (claim)"),
+    ("M", "Main assessment", "Main assessment (claim)"),
+    ("R", "HMRC amended self assessment", "HMRC amended self assessment (claim)"),
+    ("S", "Self assessment", "Self assessment (claim)"),
+    ("T", "Taxpayer amended self assessment", "Taxpayer amended self assessment"),
+    ("Z", "Return charge", "Return charge (claim)")
   )
 
+  implicit val messages: Messages = new DefaultMessagesApi(
+    Map(
+      "en" -> Map(
+        "taxDescription.assessment.a.standard" -> "Amended assessment",
+        "taxDescription.assessment.a.claim" -> "Amended assessment (claim)",
+        "taxDescription.assessment.d.standard" -> "Discovery assessment",
+        "taxDescription.assessment.d.claim" -> "Discovery assessment (claim)",
+        "taxDescription.assessment.e.standard" -> "HMRC determination",
+        "taxDescription.assessment.e.claim" -> "HMRC determination (claim)",
+        "taxDescription.assessment.f.standard" -> "Further assessment",
+        "taxDescription.assessment.f.claim" -> "Further assessment (claim)",
+        "taxDescription.assessment.j.standard" -> "HMRC amended self assessment",
+        "taxDescription.assessment.j.claim" -> "HMRC amended self assessment (claim)",
+        "taxDescription.assessment.m.standard" -> "Main assessment",
+        "taxDescription.assessment.m.claim" -> "Main assessment (claim)",
+        "taxDescription.assessment.r.standard" -> "HMRC amended self assessment",
+        "taxDescription.assessment.r.claim" -> "HMRC amended self assessment (claim)",
+        "taxDescription.assessment.s.standard" -> "Self assessment",
+        "taxDescription.assessment.s.claim" -> "Self assessment (claim)",
+        "taxDescription.assessment.t.standard" -> "Taxpayer amended self assessment",
+        "taxDescription.assessment.t.claim" -> "Taxpayer amended self assessment (claim)",
+        "taxDescription.assessment.z.standard" -> "Return charge",
+        "taxDescription.assessment.z.claim" -> "Return charge (claim)",
+      )
+    )
+  ).preferred(Seq(Lang("en")))
+
   private val taxDescriptionHelper = new TaxDescriptionHelper();
 
   "TaxDescriptionHelper" should {
@@ -48,7 +89,11 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
 
           val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
 
-          result mustBe expectedResult
+          println(s"Correction Claim Null")
+          println(s"Actual: $result")
+          println(s"Expected: $expectedResult")
+
+          result mustBe "dummy"
         }
 
         "when Correction Claim Indicator is 0" in {

From ba32043e1da260048d852da57e487127f6cabe0f Mon Sep 17 00:00:00 2001
From: jowensoc <114502866+jowensoc@users.noreply.github.com>
Date: Fri, 31 Jul 2026 13:31:01 +0100
Subject: [PATCH 4/5] DTR-6378: Resolved spec test

---
 .../utils/TaxDescriptionHelper.scala          |  16 +
 .../utils/TaxDescriptionHelperSpec.scala      | 366 +++++++++++++++---
 2 files changed, 322 insertions(+), 60 deletions(-)

diff --git a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
index 27d4e3d..99cfc71 100644
--- a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
+++ b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2026 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package uk.gov.hmrc.corporationtax.utils
 
 import play.api.i18n.Messages
diff --git a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
index 4a1278b..c6c4dfc 100644
--- a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
+++ b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
@@ -16,103 +16,349 @@
 
 package uk.gov.hmrc.corporationtax.utils
 
-import org.scalatest.Inspectors.forAll
 import org.scalatest.matchers.must.Matchers
-import org.scalatest.prop.Tables.Table
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.concurrent.ScalaFutures
 import play.api.i18n.{DefaultMessagesApi, Lang, Messages}
 
 class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutures {
 
-//  private val parametersTable = Table(
-//    ("A"),
-//    ("D"),
-//    ("E"),
-//    ("F"),
-//    ("J"),
-//    ("M"),
-//    ("R"),
-//    ("S"),
-//    ("T"),
-//    ("Z")
-//  )
-
-  private val parametersTable = Table(
-    ("A", "Amended assessment", "Amended assessment (claim)"),
-    ("D", "Discovery assessment", "Discovery assessment (claim)"),
-    ("E", "HMRC determination", "HMRC determination (claim)"),
-    ("F", "Further assessment", "Further assessment (claim)"),
-    ("J", "HMRC amended self assessment", "HMRC amended self assessment (claim)"),
-    ("M", "Main assessment", "Main assessment (claim)"),
-    ("R", "HMRC amended self assessment", "HMRC amended self assessment (claim)"),
-    ("S", "Self assessment", "Self assessment (claim)"),
-    ("T", "Taxpayer amended self assessment", "Taxpayer amended self assessment"),
-    ("Z", "Return charge", "Return charge (claim)")
-  )
-
   implicit val messages: Messages = new DefaultMessagesApi(
     Map(
       "en" -> Map(
         "taxDescription.assessment.a.standard" -> "Amended assessment",
-        "taxDescription.assessment.a.claim" -> "Amended assessment (claim)",
+        "taxDescription.assessment.a.claim"    -> "Amended assessment (claim)",
         "taxDescription.assessment.d.standard" -> "Discovery assessment",
-        "taxDescription.assessment.d.claim" -> "Discovery assessment (claim)",
+        "taxDescription.assessment.d.claim"    -> "Discovery assessment (claim)",
         "taxDescription.assessment.e.standard" -> "HMRC determination",
-        "taxDescription.assessment.e.claim" -> "HMRC determination (claim)",
+        "taxDescription.assessment.e.claim"    -> "HMRC determination (claim)",
         "taxDescription.assessment.f.standard" -> "Further assessment",
-        "taxDescription.assessment.f.claim" -> "Further assessment (claim)",
+        "taxDescription.assessment.f.claim"    -> "Further assessment (claim)",
         "taxDescription.assessment.j.standard" -> "HMRC amended self assessment",
-        "taxDescription.assessment.j.claim" -> "HMRC amended self assessment (claim)",
+        "taxDescription.assessment.j.claim"    -> "HMRC amended self assessment (claim)",
         "taxDescription.assessment.m.standard" -> "Main assessment",
-        "taxDescription.assessment.m.claim" -> "Main assessment (claim)",
+        "taxDescription.assessment.m.claim"    -> "Main assessment (claim)",
         "taxDescription.assessment.r.standard" -> "HMRC amended self assessment",
-        "taxDescription.assessment.r.claim" -> "HMRC amended self assessment (claim)",
+        "taxDescription.assessment.r.claim"    -> "HMRC amended self assessment (claim)",
         "taxDescription.assessment.s.standard" -> "Self assessment",
-        "taxDescription.assessment.s.claim" -> "Self assessment (claim)",
+        "taxDescription.assessment.s.claim"    -> "Self assessment (claim)",
         "taxDescription.assessment.t.standard" -> "Taxpayer amended self assessment",
-        "taxDescription.assessment.t.claim" -> "Taxpayer amended self assessment (claim)",
+        "taxDescription.assessment.t.claim"    -> "Taxpayer amended self assessment (claim)",
         "taxDescription.assessment.z.standard" -> "Return charge",
-        "taxDescription.assessment.z.claim" -> "Return charge (claim)",
+        "taxDescription.assessment.z.claim"    -> "Return charge (claim)"
       )
     )
   ).preferred(Seq(Lang("en")))
 
   private val taxDescriptionHelper = new TaxDescriptionHelper();
 
-  "TaxDescriptionHelper" should {
-    forAll(parametersTable) { assessmentType =>
-      s"Assessment Type is $assessmentType, it should return correct Tax Description" should {
+  s"Assessment Type is A, it should return correct Tax Description" should {
+    val assessmentType = "A"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is D, it should return correct Tax Description" should {
+    val assessmentType = "D"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is E, it should return correct Tax Description" should {
+    val assessmentType = "E"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is F, it should return correct Tax Description" should {
+    val assessmentType = "F"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-        "when Correction Claim Indicator is null" in {
-          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
 
-          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is J, it should return correct Tax Description" should {
+    val assessmentType = "J"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-          println(s"Correction Claim Null")
-          println(s"Actual: $result")
-          println(s"Expected: $expectedResult")
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
 
-          result mustBe "dummy"
-        }
+      result mustBe expectedResult
+    }
 
-        "when Correction Claim Indicator is 0" in {
-          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
 
-          result mustBe expectedResult
-        }
+      result mustBe expectedResult
+    }
 
-        "when Correction Claim Indicator is 2" in {
-          val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-          val expectedResult = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
 
-          result mustBe expectedResult
-        }
-      }
+      result mustBe expectedResult
     }
   }
 
+  s"Assessment Type is M, it should return correct Tax Description" should {
+    val assessmentType = "M"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is R, it should return correct Tax Description" should {
+    val assessmentType = "M"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is S, it should return correct Tax Description" should {
+    val assessmentType = "S"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is T, it should return correct Tax Description" should {
+    val assessmentType = "T"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
+
+  s"Assessment Type is Z, it should return correct Tax Description" should {
+    val assessmentType = "Z"
+
+    "when Correction Claim Indicator is null" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 0" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+
+    "when Correction Claim Indicator is 2" in {
+      val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
+
+      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val expectedResult = messages(messageName)
+
+      result mustBe expectedResult
+    }
+  }
 }

From ab9e059463a01969dde88aa0ad25d3edee9eb393 Mon Sep 17 00:00:00 2001
From: jowensoc <114502866+jowensoc@users.noreply.github.com>
Date: Fri, 31 Jul 2026 14:38:58 +0100
Subject: [PATCH 5/5] DTR-6378: fixed scala formatting

---
 .../utils/TaxDescriptionHelper.scala          |  9 ++-
 .../utils/TaxDescriptionHelperSpec.scala      | 60 +++++++++----------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
index 99cfc71..b3fa62a 100644
--- a/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
+++ b/app/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelper.scala
@@ -22,18 +22,17 @@ import scala.concurrent.Future
 
 class TaxDescriptionHelper {
 
-  def getTaxDescription(assessmentType: String, correctionClaim: String)(implicit messages: Messages): Future[String] = {
+  def getTaxDescription(assessmentType: String, correctionClaim: String)(implicit messages: Messages): Future[String] =
     Future.successful {
       val messageType = correctionClaim match {
         case "0" => "standard"
         case "2" => "claim"
-        case _ => "standard"
+        case _   => "standard"
       }
-      
+
       val result = messages(s"taxDescription.assessment.${assessmentType.toLowerCase()}.$messageType");
-      
+
       result
     }
-  }
 
 }
diff --git a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
index c6c4dfc..f1e4810 100644
--- a/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
+++ b/test/uk/gov/hmrc/corporationtax/utils/TaxDescriptionHelperSpec.scala
@@ -58,7 +58,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -67,7 +67,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -76,7 +76,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -89,7 +89,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -98,7 +98,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -107,7 +107,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -120,7 +120,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -129,7 +129,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -138,7 +138,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -151,7 +151,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -160,7 +160,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -169,7 +169,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -182,7 +182,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -191,7 +191,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -200,7 +200,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -213,7 +213,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -222,7 +222,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -231,7 +231,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -244,7 +244,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -253,7 +253,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -262,7 +262,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -275,7 +275,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -284,7 +284,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -293,7 +293,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -306,7 +306,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -315,7 +315,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -324,7 +324,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -337,7 +337,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is null" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, null).futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -346,7 +346,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 0" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "0").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.standard"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult
@@ -355,7 +355,7 @@ class TaxDescriptionHelperSpec extends AnyWordSpec with Matchers with ScalaFutur
     "when Correction Claim Indicator is 2" in {
       val result: String = taxDescriptionHelper.getTaxDescription(assessmentType, "2").futureValue
 
-      val messageName = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
+      val messageName    = s"taxDescription.assessment.${assessmentType.toLowerCase()}.claim"
       val expectedResult = messages(messageName)
 
       result mustBe expectedResult