Simplify interface for getDeviceFactory

Get the kind from the class
stanford-oval · Oct 18, 2019 · 1337835 · 1337835
1 parent bc7fefc
commit 1337835
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/lib/device_factory_utils.js b/lib/device_factory_utils.js
@@ -70,15 +70,15 @@ function makeDeviceFactory(classDef, device) {
         return {
             type: 'discovery',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name,
             discoveryType: 'bluetooth'
         };
     case 'org.thingpedia.config.discovery.upnp':
         return {
             type: 'discovery',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name,
             discoveryType: 'upnp'
         };
@@ -87,15 +87,15 @@ function makeDeviceFactory(classDef, device) {
         return {
             type: 'interactive',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name
         };
 
     case 'org.thingpedia.config.none':
         return {
             type: 'none',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name
         };
 
@@ -104,15 +104,15 @@ function makeDeviceFactory(classDef, device) {
         return {
             type: 'oauth2',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name
         };
 
     case 'org.thingpedia.config.form':
         return {
             type: 'form',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name,
             fields: toFields(getInputParam(config, 'params'))
         };
@@ -121,7 +121,7 @@ function makeDeviceFactory(classDef, device) {
         return {
             type: 'form',
             category: device.category,
-            kind: device.primary_kind,
+            kind: classDef.kind,
             text: device.name,
             fields: [
                 { name: 'username', label: 'Username', type: 'text' },

diff --git a/test/test_device_factories.js b/test/test_device_factories.js
@@ -19,7 +19,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.none();
     }`, {
-        primary_kind: "com.bing",
         name: "Bing Search",
         category: 'data',
     }, {
@@ -33,7 +32,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.basic_auth(extra_params=makeArgMap(serial_number : String));
     }`, {
-        primary_kind: "com.bodytrace.scale",
         name: "BodyTrace Scale",
         category: 'physical',
     }, {
@@ -69,7 +67,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.custom_oauth();
     }`, {
-        primary_kind: "com.twitter",
         name: "Twitter Account",
         category: 'online',
     }, {
@@ -83,7 +80,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.oauth2(client_id="foo", client_secret="bar");
     }`, {
-        primary_kind: "com.linkedin",
         name: "LinkedIn Account",
         category: 'online',
     }, {
@@ -97,7 +93,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.discovery.upnp(search_target=['urn:lge:com:service:webos:second-screen-1']);
     }`, {
-        primary_kind: "com.lg.tv.webos2",
         name: "LG TV",
         category: 'physical',
     }, {
@@ -112,7 +107,6 @@ const TEST_CASES = [
         import loader from @org.thingpedia.v2();
         import config from @org.thingpedia.config.discovery.bluetooth(uuids=['0000110b-0000-1000-8000-00805f9b34fb']);
     }`, {
-        primary_kind: "org.thingpedia.bluetooth.speaker.a2dp",
         name: "Bluetooth Speaker",
         category: 'physical',
     }, {