OCF: Use endpoints in more tests

Author: Gabriel Schulhof

Diff for: ocf/tests/oic1.1.0-1/Observe - Resource (Failure)/client.js

@@ -16,9 +16,23 @@ var client = require( process.argv[ 3 ] ).client;
 
 console.log( JSON.stringify( { assertionCount: 1 } ) );
 
+function pickEndpoint( endpoints ) {
+	var index, isSecureEndpoint;
+
+	for ( index in endpoints ) {
+		isSecureEndpoint = endpoints[ index ].origin.substr( 0, 5 ) === "coaps";
+		if ( isSecureEndpoint && process.argv[ 4 ] === "true" ) {
+			return endpoints[ index ];
+		} else if ( !isSecureEndpoint && process.argv[ 4 ] === "false" ) {
+			return endpoints[ index ];
+		}
+	}
+}
+
 function dummyListener() {}
 
 function performObservation( resource ) {
+	resource.endpoint = pickEndpoint( resource.endpoints );
 	resource
 		.on( "error", function( error ) {
 			console.log( JSON.stringify( { assertion: "strictEqual", arguments: [

Diff for: ocf/tests/oic1.1.0-1/Observe - Resource (Repeated)/client.js

@@ -16,6 +16,19 @@ var client = require( process.argv[ 3 ] ).client;
 
 console.log( JSON.stringify( { assertionCount: 2 } ) );
 
+function pickEndpoint( endpoints ) {
+	var index, isSecureEndpoint;
+
+	for ( index in endpoints ) {
+		isSecureEndpoint = endpoints[ index ].origin.substr( 0, 5 ) === "coaps";
+		if ( isSecureEndpoint && process.argv[ 4 ] === "true" ) {
+			return endpoints[ index ];
+		} else if ( !isSecureEndpoint && process.argv[ 4 ] === "false" ) {
+			return endpoints[ index ];
+		}
+	}
+}
+
 function observeResource( resource ) {
 	return new Promise( function( fulfill ) {
 		var updateCount = 0;
@@ -28,6 +41,7 @@ function observeResource( resource ) {
 				fulfill();
 			}
 		}
+		resource.endpoint = pickEndpoint( resource.endpoints );
 		resource.on( "update", update );
 	} );
 }

Diff for: ocf/tests/oic1.1.0-1/Observe - Resource/client.js

@@ -45,17 +45,19 @@ function pickEndpoint( endpoints ) {
 function secondPositiveListener( resource ) {
 	secondPositiveCount++;
 	console.log( JSON.stringify( { assertion: "ok", arguments: [
-		resource.properties.value > 0, "Client: Second listener: sensor value is positive"
+		resource.properties.value > 0,
+		"Client: Second listener: sensor value is positive at observation " + secondPositiveCount
 	] } ) );
-	if ( secondNegativeCount >= 4 ) {
+	if ( secondPositiveCount >= 4 ) {
 		resource.removeListener( "update", secondPositiveListener );
 	}
 }
 
 function positiveListener( resource ) {
 	positiveCount++;
 	console.log( JSON.stringify( { assertion: "ok", arguments: [
-		resource.properties.value > 0, "Client: sensor value is positive"
+		resource.properties.value > 0,
+		"Client: sensor value is positive at observation " + positiveCount
 	] } ) );
 
 	// After three notifications, hand over to the second listener, with two notifications where
@@ -86,7 +88,8 @@ function positiveListener( resource ) {
 function secondNegativeListener( resource ) {
 	secondNegativeCount++;
 	console.log( JSON.stringify( { assertion: "ok", arguments: [
-		resource.properties.value < 0, "Client: Second listener: sensor value is negative"
+		resource.properties.value < 0,
+		"Client: Second listener: sensor value is negative at observation " + secondNegativeCount
 	] } ) );
 	if ( secondNegativeCount >= 5 ) {
 		resource.removeListener( "update", secondNegativeListener );
@@ -96,13 +99,15 @@ function secondNegativeListener( resource ) {
 function negativeListener( resource ) {
 	negativeCount++;
 	console.log( JSON.stringify( { assertion: "ok", arguments: [
-		resource.properties.value < 0, "Client: sensor value is negative"
+		resource.properties.value < 0,
+		"Client: sensor value is negative at observation " + negativeCount
 	] } ) );
 
 	// After two notifications, hand over to the second listener, with three notifications where
 	// both listeners are attached
 	if ( negativeCount > 1 && addSecondNegativeListener ) {
 		addSecondNegativeListener = false;
+		resource.endpoint = pickEndpoint( resource.endpoints );
 		client.retrieve( resource, { scale: -1 }, secondNegativeListener )
 			.then(
 				function( secondResource ) {
@@ -123,6 +128,7 @@ function negativeListener( resource ) {
 }
 
 function performObservation( resource ) {
+	resource.endpoint = pickEndpoint( resource.endpoints );
 	resource.on( "update", positiveListener );
 
 	client

Diff for: ocf/tests/oic1.1.0-1/Observe - Resource/server.js

@@ -45,7 +45,7 @@ function fakeSensorLoop( resource ) {
 			.then(
 				function() {
 					console.log( JSON.stringify( { assertion: "ok", arguments: [
-						true, "Server: Notification successful"
+						true, "Server: Notification " + notificationCount + " successful"
 					] } ) );
 				},
 				function( error ) {