Tested with csw-6.0.0, fixed tests

Author: abrighton

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [csw-c v6.0.0] - 2025-05-08
+
+### Changed
+
+- Updated for csw-6.0.0
+
 ## [csw-c v5.0.0] - 2022-11-30
 
 ### Changed

test/runTests.sh

@@ -7,8 +7,8 @@
 hash sbt 2>/dev/null || { echo >&2 "Please install sbt first.  Aborting."; exit 1; }
 hash cs 2>/dev/null || { echo >&2 "Please install cs first.  Aborting."; exit 1; }
 
-CSW_VERSION=2f05249
-CS_CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update-esw-http-api/apps.json"
+CSW_VERSION=6.0.0
+CS_CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"
 
 logfile=test.log
 if ! hash cs 2>/dev/null ; then
@@ -33,4 +33,4 @@ kill $assemblyPid
 # Kill csw-services
 kill `ps aux | grep 'csw-services' | grep -v grep | awk '{print $2}'`
 echo "================ logfile contents ========================="
-cat $logfile
+#cat $logfile

test/testSupport/project/Libs.scala

@@ -1,11 +1,11 @@
 import sbt._
 
 object Libs {
-  val ScalaVersion = "3.6.2"
+  val ScalaVersion = "3.6.4"
 }
 
 object CSW {
-    val Version = "2f05249"
+    val Version = "6.0.0"
 
   val `csw-framework` = "com.github.tmtsoftware.csw" %% "csw-framework" % Version
   val `csw-testkit`   = "com.github.tmtsoftware.csw" %% "csw-testkit" % Version

test/testSupport/test-assembly/src/main/scala/org/tmt/csw/testassembly/TestAssemblyHandlers.scala

@@ -2,8 +2,8 @@ package org.tmt.csw.testassembly
 
 import java.io.{File, FileOutputStream}
 
-import pekko.actor.typed.Behavior
-import pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.Behavior
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
 import csw.command.client.messages.TopLevelActorMessage
 import csw.framework.models.CswContext
 import csw.framework.scaladsl.ComponentHandlers
@@ -37,7 +37,7 @@ object TestAssemblyHandlers {
     "MinorPlanetCoordEvent",
     "SolarSystemCoordsEvent",
     "EqCoordsEvent"
-  ).map(EventName)
+  ).map(EventName.apply)
   private val eventKeys = eventNames.map(EventKey(prefix, _))
 
   // Generate a test file with the JSON for the received events, as an easy way to compare with the expected values

test/testSupport/test-deploy/src/main/scala/org/tmt/csw/testdeploy/TestContainerCmdApp.scala

@@ -3,8 +3,8 @@ package org.tmt.csw.testdeploy
 import csw.framework.deploy.containercmd.ContainerCmd
 import csw.prefix.models.Subsystem
 
-object TestContainerCmdApp extends App {
-
-  ContainerCmd.start("testContainerCmdApp", Subsystem.withNameInsensitive("CSW"), args)
-
+object TestContainerCmdApp {
+  def main(args: Array[String]): Unit = {
+    ContainerCmd.start("testContainerCmdApp", Subsystem.withNameInsensitive("CSW"), args)
+  }
 }

test/testSupport/test-deploy/src/main/scala/org/tmt/csw/testdeploy/TestHostConfigApp.scala

@@ -3,8 +3,8 @@ package org.tmt.csw.testdeploy
 import csw.framework.deploy.hostconfig.HostConfig
 import csw.prefix.models.Subsystem
 
-object TestHostConfigApp extends App {
-
-  HostConfig.start("test-host-config-app", Subsystem.withNameInsensitive("CSW"), args)
-
+object TestHostConfigApp {
+  def main(args: Array[String]): Unit = {
+    HostConfig.start("test-host-config-app", Subsystem.withNameInsensitive("CSW"), args)
+  }
 }