Changes in test StreamsxSttgateway::SamplesCompile due to new dependencies

Author: joergboe

tests/frameworktests/tests/StreamsxSttgateway/SamplesCompile/TestCase.sh

@@ -21,6 +21,10 @@
 setCategory 'quick'
 
 #skip the special samples unless some environments are set
+if [[ $TTRO_variantCase == 'STTGatewayUtils' ]]; then
+	setSkip 'Dependency toolkit is compiled in TestSuite.sh since (since v.2.2.5)'
+fi
+
 if [[ $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonS2T' ]]; then
 	if isExistingAndTrue TTPR_StreamsxSpeech2TextToolkit && isExistingAndTrue TTPR_StreamsxNetworkToolkit; then
 		export STREAMS_S2T_TOOLKIT="$TTPR_StreamsxSpeech2TextToolkit"
@@ -29,27 +33,38 @@ if [[ $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonS2T' ]]; then
 		setSkip "sample requires TTPR_StreamsxSpeech2TextToolkit and TTPR_StreamsxNetworkToolkit"
 	fi
 fi
-if [[ $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonSTT' || $TTRO_variantCase == 'stt_results_http_receiver' || $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonS2T' ]]; then
+if [[ $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonSTT' || $TTRO_variantCase == 'stt_results_http_receiver' || $TTRO_variantCase == 'VoiceGatewayToStreamsToWatsonS2T' || $TTRO_variantCase == 'VgwDataRouter' || $TTRO_variantCase == 'VgwDataRouterToWatsonSTT' ]]; then
 	if isExistingAndTrue TTPR_StreamsxWebsocketToolkit; then
 		export STREAMS_WEBSOCKET_TOOLKIT="$TTPR_StreamsxWebsocketToolkit"
 	else
 		setSkip "sample requires TTPR_StreamsxWebsocketToolkit"
 	fi
 fi
 
+if [[ $TTRO_variantCase == 'VgwDataRouterToWatsonS2T' ]]; then
+	if isExistingAndTrue TTPR_StreamsxSpeech2TextToolkit && isExistingAndTrue TTPR_StreamsxNetworkToolkit && isExistingAndTrue TTPR_StreamsxWebsocketToolkit; then
+		export STREAMS_S2T_TOOLKIT="$TTPR_StreamsxSpeech2TextToolkit"
+		export STREAMS_NETWORK_TOOLKIT="$TTPR_StreamsxNetworkToolkit"
+		export STREAMS_WEBSOCKET_TOOLKIT="$TTPR_StreamsxWebsocketToolkit"
+	else
+		setSkip "to many dependencies required"
+	fi
+fi
+
 if [[ $TTRO_variantCase == 'VoiceDataSimulator' ]]; then
 	setSkip "sample is not an spl sample"
 fi
 
-function testStep {
-	local save="$PWD"
-	cd "$TTPR_SreamsxSttgatewaySamplesPath/$TTRO_variantCase"
-	pwd
+testStep() {
 	export SPL_CMD_ARGS="-j $TTRO_treads"
 	export STREAMS_STTGATEWAY_TOOLKIT="$TTPR_streamsxSttgatewayToolkit"
 	export STREAMS_JSON_TOOLKIT="$TTPR_streamsxJsonToolkit"
 	export STREAMS_INET_TOOLKIT="$TTPR_streamsxInetToolkit"
+	local save="$PWD"
+	cd "$TTPR_SreamsxSttgatewaySamplesPath/$TTRO_variantCase"
+	pwd
 	echoExecuteInterceptAndSuccess 'make' 'all'
 	cd "$save"
 	return 0
-}
+}
+

tests/frameworktests/tests/StreamsxSttgateway/TestSuite.sh

@@ -16,3 +16,17 @@ if isExistingAndTrue TTPR_StreamsxNetworkToolkit; then
 fi
 
 setVar 'TT_toolkitPath' "${TTTT_myToolkitPath}"
+
+testPreparation() {
+	export SPL_CMD_ARGS="-j $TTRO_treads"
+	export STREAMS_STTGATEWAY_TOOLKIT="$TTPR_streamsxSttgatewayToolkit"
+	export STREAMS_JSON_TOOLKIT="$TTPR_streamsxJsonToolkit"
+	export STREAMS_INET_TOOLKIT="$TTPR_streamsxInetToolkit"
+	echo "Compile dependency toolkit"
+	local save="$PWD"
+	cd "$TTPR_SreamsxSttgatewaySamplesPath/STTGatewayUtils"
+	pwd
+	echoAndExecute 'make' 'all'
+	cd "$save"
+}
+

tests/frameworktests/tests/TestProperties.sh

@@ -21,4 +21,7 @@ setVar 'TTPR_SpeechToTextApikeyFile' "${TTRO_inputDir}/apikey.enc"
 
 # Set the new introduced dependency to websocket toolkit
 # you may overwrite this in a myProperties.sh file
-# setVar 'TTPR_StreamsxWebsocketToolkit' "$HOME/workspace/streamsx.websocket/com.ibm.streamsx.websocket"
+#setVar 'TTPR_StreamsxWebsocketToolkit' "$HOME/git/streamsx.websocket/com.ibm.streamsx.websocket"
+#setVar 'TTPR_StreamsxSpeech2TextToolkit' "$HOME/toolkits/com.ibm.streams.speech2text"
+#setVar 'TTPR_StreamsxNetworkToolkit' "$HOME/toolkits/com.ibm.streamsx.network-3.4.3/com.ibm.streamsx.network"
+