Fix failing tests

Rakesh Kashyap Hanasoge Padmanabha · Rakesh Kashyap Hanasoge Padmanabha · commit 53780f8cd0d1 · 2023-05-16T14:39:27.000-07:00
diff --git a/feathr-impl/src/test/scala/com/linkedin/feathr/offline/AnchoredFeaturesIntegTest.scala b/feathr-impl/src/test/scala/com/linkedin/feathr/offline/AnchoredFeaturesIntegTest.scala
@@ -562,7 +562,7 @@ class AnchoredFeaturesIntegTest extends FeathrIntegTest {
       Row(mutable.WrappedArray.make(Array("")), mutable.WrappedArray.make(Array(1.0f))))
     assertEquals(SuppressedExceptionHandlerUtils.missingFeatures,
       Set("featureWithNull", "featureWithNull3", "featureWithNull5", "featureWithNull4", "featureWithNull7",
-        "aEmbedding", "featureWithNull6", "derived_featureWithNull", "seqJoin_featureWithNull"))
+        "aEmbedding", "featureWithNull6", "derived_featureWithNull", "seqJoin_featureWithNull", "derived_featureWithNull7"))
     setFeathrJobParam(ADD_DEFAULT_COL_FOR_MISSING_DATA, "false")
   }
 
diff --git a/feathr-impl/src/test/scala/com/linkedin/feathr/offline/derived/TestSequentialJoinAsDerivation.scala b/feathr-impl/src/test/scala/com/linkedin/feathr/offline/derived/TestSequentialJoinAsDerivation.scala
@@ -11,8 +11,9 @@ import com.linkedin.feathr.offline.job.FeatureTransformation.FEATURE_NAME_PREFIX
 import com.linkedin.feathr.offline.join.algorithms.{SeqJoinExplodedJoinKeyColumnAppender, SequentialJoinConditionBuilder, SparkJoinWithJoinCondition}
 import com.linkedin.feathr.offline.logical.FeatureGroups
 import com.linkedin.feathr.offline.mvel.plugins.FeathrExpressionExecutionContext
+import com.linkedin.feathr.offline.util.FeathrUtils
 import com.linkedin.feathr.offline.{TestFeathr, TestUtils}
-import org.apache.spark.SparkException
+import org.apache.spark.{SparkConf, SparkContext, SparkException}
 import org.apache.spark.sql.functions.{when => _, _}
 import org.apache.spark.sql.types._
 import org.apache.spark.sql.{AnalysisException, DataFrame, Row, SparkSession}
@@ -985,6 +986,12 @@ class TestSequentialJoinAsDerivation extends TestFeathr with MockitoSugar {
     val mockDerivationFunction = mock[SeqJoinDerivationFunction]
     val mockBaseTaggedDependency = mock[BaseTaggedDependency]
     val mockTaggedDependency = mock[TaggedDependency]
+    val mockSparkContext = mock[SparkContext]
+    val mockSparkConf = mock[SparkConf]
+    when(mockSparkContext.getConf).thenReturn(mockSparkConf)
+    when(mockSparkSession.sparkContext).thenReturn(mockSparkContext)
+    when(mockSparkConf.get(s"${FeathrUtils.FEATHR_PARAMS_PREFIX}${FeathrUtils.ADD_DEFAULT_COL_FOR_MISSING_DATA}", "false"))
+      .thenReturn("false")
     // mock derivation function
     when(mockDerivedFeature.derivation.asInstanceOf[SeqJoinDerivationFunction]).thenReturn(mockDerivationFunction)
     when(mockDerivedFeature.producedFeatureNames).thenReturn(Seq("seqJoinFeature"))
@@ -1059,6 +1066,13 @@ class TestSequentialJoinAsDerivation extends TestFeathr with MockitoSugar {
     val mockDerivationFunction = mock[SeqJoinDerivationFunction]
     val mockBaseTaggedDependency = mock[BaseTaggedDependency]
     val mockTaggedDependency = mock[TaggedDependency]
+    val mockSparkConf = mock[SparkConf]
+    val mockSparkContext = mock[SparkContext]
+    when(mockSparkSession.sparkContext).thenReturn(mockSparkContext)
+    when(mockSparkContext.getConf).thenReturn(mockSparkConf)
+    when(mockSparkConf.get(s"${FeathrUtils.FEATHR_PARAMS_PREFIX}${FeathrUtils.ADD_DEFAULT_COL_FOR_MISSING_DATA}",
+      "false"))
+      .thenReturn("false")
     // mock derivation function
     when(mockDerivedFeature.derivation.asInstanceOf[SeqJoinDerivationFunction]).thenReturn(mockDerivationFunction)
     when(mockDerivedFeature.producedFeatureNames).thenReturn(Seq("seqJoinFeature"))
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version=1.0.4-rc4
+version=1.0.4-rc5
 SONATYPE_AUTOMATIC_RELEASE=true
 POM_ARTIFACT_ID=feathr_2.12

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ class AnchoredFeaturesIntegTest extends FeathrIntegTest {`
`562`	`562`	`Row(mutable.WrappedArray.make(Array("")), mutable.WrappedArray.make(Array(1.0f))))`
`563`	`563`	`assertEquals(SuppressedExceptionHandlerUtils.missingFeatures,`
`564`	`564`	`Set("featureWithNull", "featureWithNull3", "featureWithNull5", "featureWithNull4", "featureWithNull7",`
`565`		`- "aEmbedding", "featureWithNull6", "derived_featureWithNull", "seqJoin_featureWithNull"))`
	`565`	`+ "aEmbedding", "featureWithNull6", "derived_featureWithNull", "seqJoin_featureWithNull", "derived_featureWithNull7"))`
`566`	`566`	`setFeathrJobParam(ADD_DEFAULT_COL_FOR_MISSING_DATA, "false")`
`567`	`567`	`}`
`568`	`568`