SNOW-1062684: Finalize test changes after server-side support

Author: sfc-gh-heshah

src/main/scala/com/snowflake/snowpark/internal/JavaUtils.scala

@@ -25,6 +25,7 @@ import com.snowflake.snowpark.{
 }
 
 import java.io._
+import com.snowflake.snowpark.internal.Utils.SnowparkPackageName
 import com.snowflake.snowpark.types.{Geography, Geometry, Variant}
 import com.snowflake.snowpark_java.types.InternalUtils
 import com.snowflake.snowpark_java.udtf._
@@ -33,6 +34,8 @@ import scala.collection.{JavaConverters, mutable}
 import scala.collection.JavaConverters._
 
 object JavaUtils {
+  def snowparkPackageName(): String = SnowparkPackageName
+
   def session_setJavaAPI(builder: SessionBuilder): SessionBuilder =
     builder.setJavaAPI()
 

src/test/java/com/snowflake/snowpark_test/JavaStoredProcedureSuite.java

@@ -1,6 +1,7 @@
 package com.snowflake.snowpark_test;
 
 import com.snowflake.snowpark.SnowparkClientException;
+import com.snowflake.snowpark.internal.JavaUtils;
 import com.snowflake.snowpark_java.Row;
 import com.snowflake.snowpark_java.Session;
 import com.snowflake.snowpark_java.StoredProcedure;
@@ -37,7 +38,9 @@ public void call() {
             + "returns STRING\n"
             + "language scala\n"
             + "runtime_version=2.12\n"
-            + "packages=('com.snowflake:snowpark:latest')\n"
+            + "packages=('"
+            + JavaUtils.snowparkPackageName()
+            + ":latest')\n"
             + "handler='Test.run'\n"
             + "as\n"
             + "$$\n"

src/test/scala/com/snowflake/snowpark/TestUtils.scala

@@ -125,7 +125,7 @@ object TestUtils extends Logging {
     sess.removeDependency(snClassDir)
     if (usePackages) {
       sess.removePackage(Utils.clientPackageName)
-      sess.addPackage("com.snowflake:snowpark:latest")
+      sess.addPackage(s"${Utils.SnowparkPackageName}:latest")
     } else {
       // Replace scoverage classes in classpath because they are instrumented.
       sess.addDependency(snClassDir.replace("scoverage-", ""))
@@ -147,10 +147,7 @@ object TestUtils extends Logging {
       classOf[org.scalatest.compatible.Assertion],
       classOf[org.scalactic.TripleEquals], // scalactic jar
       classOf[io.opentelemetry.exporters.inmemory.InMemorySpanExporter],
-      classOf[io.opentelemetry.sdk.trace.export.SpanExporter],
-      classOf[scala.Product],
-      classOf[scala.reflect.api.Universe],
-      classOf[scala.tools.nsc.Global])
+      classOf[io.opentelemetry.sdk.trace.export.SpanExporter])
       .flatMap(UDFClassPath.getPathForClass(_))
       .foreach(path => {
         val file = new File(path)
@@ -179,10 +176,7 @@ object TestUtils extends Logging {
       classOf[BeforeAndAfterAll], // scala test jar
       classOf[org.scalactic.TripleEquals], // scalactic jar
       classOf[io.opentelemetry.exporters.inmemory.InMemorySpanExporter],
-      classOf[io.opentelemetry.sdk.trace.export.SpanExporter],
-      classOf[scala.Product],
-      classOf[scala.reflect.api.Universe],
-      classOf[scala.tools.nsc.Global])
+      classOf[io.opentelemetry.sdk.trace.export.SpanExporter])
       .flatMap(UDFClassPath.getPathForClass(_))
       .foreach(path => {
         val file = new File(path)

src/test/scala/com/snowflake/snowpark/UDFClasspathSuite.scala

@@ -3,7 +3,7 @@ package com.snowflake.snowpark
 import java.io.File
 import java.net.URLClassLoader
 import com.snowflake.snowpark.internal.ScalaFunctions._toUdf
-import com.snowflake.snowpark.internal.Utils.clientPackageName
+import com.snowflake.snowpark.internal.Utils
 import com.snowflake.snowpark.internal.{UDFClassPath, UDXRegistrationHandler, Utils}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.{atLeastOnce, never, reset, spy, times, verify}
@@ -97,8 +97,8 @@ class UDFClasspathSuite extends SNTestBase {
     val fixedPath = path.replace("scoverage-", "")
     // Remove snowpark jar from classpath, The code will catch error and add the path and retry
     newSession.removeDependency(fixedPath)
-    newSession.removePackage("com.snowflake:snowpark:latest")
-    newSession.removePackage(clientPackageName)
+    newSession.removePackage(s"${Utils.SnowparkPackageName}:latest")
+    newSession.removePackage(Utils.clientPackageName)
     val func = "func_" + Random.nextInt().abs
 
     ignoreClassNotFoundForScoverageClasses {

src/test/scala/com/snowflake/snowpark/UDFInternalSuite.scala

@@ -46,7 +46,7 @@ class UDFInternalSuite extends TestData {
       verify(mockSession, times(1)).addDependency(path)
     }
     verify(mockSession, times(1)).removeDependency(path)
-    verify(mockSession, times(1)).addPackage("com.snowflake:snowpark:latest")
+    verify(mockSession, times(1)).addPackage(s"${Utils.SnowparkPackageName}:latest")
   }
 
   test("Test permanent udf not failing back to upload jar", JavaStoredProcExclude) {
@@ -80,7 +80,7 @@ class UDFInternalSuite extends TestData {
       verify(mockSession, times(1)).addDependency(path)
     }
     verify(mockSession, times(1)).removeDependency(path)
-    verify(mockSession, times(1)).addPackage("com.snowflake:snowpark:latest")
+    verify(mockSession, times(1)).addPackage(s"${Utils.SnowparkPackageName}:latest")
   }
 
   test("Test add version logic", JavaStoredProcExclude) {
@@ -189,7 +189,7 @@ class PackageUDFSuite extends UDFSuite {
     val snClassDir = UDFClassPath.getPathForClass(classOf[Session]).get
     session.removeDependency(snClassDir.replace("scoverage-", ""))
     session.removePackage(Utils.clientPackageName)
-    session.addPackage("com.snowflake:snowpark:latest")
+    session.addPackage(s"${Utils.SnowparkPackageName}:latest")
   }
 
   override def afterAll: Unit = {
@@ -207,7 +207,7 @@ class PackageUDTFSuite extends UDTFSuite {
     val snClassDir = UDFClassPath.getPathForClass(classOf[Session]).get
     session.removeDependency(snClassDir.replace("scoverage-", ""))
     session.removePackage(Utils.clientPackageName)
-    session.addPackage("com.snowflake:snowpark:latest")
+    session.addPackage(s"${Utils.SnowparkPackageName}:latest")
   }
 
   override def afterAll: Unit = {

src/test/scala/com/snowflake/snowpark_test/StoredProcedureSuite.scala

@@ -1,6 +1,7 @@
 package com.snowflake.snowpark_test
 
 import com.snowflake.snowpark._
+import com.snowflake.snowpark.internal.Utils.SnowparkPackageName;
 import net.snowflake.client.jdbc.SnowflakeSQLException
 
 import java.sql.{Date, Timestamp}
@@ -29,7 +30,7 @@ class StoredProcedureSuite extends SNTestBase {
          |returns STRING
          |language scala
          |runtime_version=2.12
-         |packages=('com.snowflake:snowpark:latest')
+         |packages=('${SnowparkPackageName}:latest')
          |handler='Test.run'
          |as
          |$$$$
@@ -56,7 +57,7 @@ class StoredProcedureSuite extends SNTestBase {
          |returns STRING
          |language scala
          |runtime_version=2.12
-         |packages=('com.snowflake:snowpark:latest')
+         |packages=('${SnowparkPackageName}:latest')
          |handler='Test.run'
          |as
          |$$$$
@@ -81,7 +82,7 @@ class StoredProcedureSuite extends SNTestBase {
          |returns STRING
          |language scala
          |runtime_version=2.12
-         |packages=('com.snowflake:snowpark:latest')
+         |packages=('${SnowparkPackageName}:latest')
          |handler='Test.run'
          |as
          |$$$$