diff --git a/config.json b/config.json index 92e42dd7..e28861ea 100644 --- a/config.json +++ b/config.json @@ -271,7 +271,7 @@ "slug": "http-billion-dollar-question", "name": "Billion Dollar Question", "uuid": "b04ddc58-04e3-49d5-a4c0-59728af04503", - "status": "wip", + "status": "active", "practices": [], "prerequisites": [], "difficulty": 4, diff --git a/exercises/practice/http-billion-dollar-question/.docs/instructions.md b/exercises/practice/http-billion-dollar-question/.docs/instructions.md index 74e77fd0..e63a09e6 100644 --- a/exercises/practice/http-billion-dollar-question/.docs/instructions.md +++ b/exercises/practice/http-billion-dollar-question/.docs/instructions.md @@ -4,19 +4,19 @@ You have been asked to find the top `x` billionaires by net worth in a given set of countries (number of countries = `N`). To implement that, you have been given access to an API that returns the details of the billionaires by country. -To simplify accessing the API, you can use the [`ims/billionairehub` client](https://lib.ballerina.io/ims/billionairehub/1.0.0/clients/Client) connector to connect to the API which returns details of the billionaires by country. +To simplify accessing the API, you can use a predefined client connector to connect to the API which returns details of the billionaires by country. ```ballerina -import ims/billionairehub; +import ballerina_exercism/http_billion_dollar_question.billionairehub_client as billionairehubClient; -# Client ID and Client Secret to connect to the billionaire API -configurable string clientId = ?; -configurable string clientSecret = ?; +type Billionaire record {| + string name; + float netWorth; +|}; public function getTopXBillionaires(string[] countries, int x) returns string[]|error { - // Create the client connector - billionairehub:Client cl = check new ({auth: {clientId, clientSecret}}); + billionairehubClient:billionaireClient cl = check new; // TODO Write your logic here return []; @@ -55,16 +55,15 @@ Limit: 5 Output ``` -["Mukesh Ambani", "Gautam Adani & family", "Zhong Shanshan", "Zhang Yiming", "Ma Huateng"] +["Mukesh Ambani","Zhong Shanshan","Ma Huateng","Colin Huang","Pony Ma"] ``` ## Test Environment -* Client ID and Client Secret to connect to the billionaire API have been provided to you in the `tests/Config.toml`. You can use them to initialize the client. * Use `bal test` to run and test your implementation. ## Hints -* `ims/billionairehub` package's [client](https://lib.ballerina.io/ims/billionairehub/1.0.0/clients/Client) can be used to invoke the get billionaires by country API. You can use the `getBillionaires("")` remote method specifically. -* You can find the richest people per country first and then combine them to find the top `x` -* [Query expressions](https://ballerina.io/learn/by-example/query-expressions/) will be convenient for filtering and sorting +* Use the `getBillionaires` remote method defined in the `billionairehub_client ` module. +* You can find the richest people per country first and then combine them to find the top `x`. +* [Query expressions](https://ballerina.io/learn/by-example/query-expressions/) will be convenient for filtering and sorting. diff --git a/exercises/practice/http-billion-dollar-question/.meta/config.json b/exercises/practice/http-billion-dollar-question/.meta/config.json index 0f6eaa47..48f03e30 100644 --- a/exercises/practice/http-billion-dollar-question/.meta/config.json +++ b/exercises/practice/http-billion-dollar-question/.meta/config.json @@ -19,5 +19,5 @@ "icon": "elons-toys", "blurb": "Can you find the top billionaires by net worth in a given set of countries?", "source": "This is an exercise to introduce users to using Ballerina HTTP service data binding", - "source_url": "https://ballerina.io/learn/by-example/http-data-binding" + "source_url": "https://ballerina.io/learn/by-example/http-service-data-binding/" } diff --git a/exercises/practice/http-billion-dollar-question/.meta/reference/main.bal b/exercises/practice/http-billion-dollar-question/.meta/reference/main.bal index 8afcb18d..f6777301 100644 --- a/exercises/practice/http-billion-dollar-question/.meta/reference/main.bal +++ b/exercises/practice/http-billion-dollar-question/.meta/reference/main.bal @@ -1,24 +1,13 @@ -import ballerina/io; -import ims/billionairehub; +import ballerina_exercism/http_billion_dollar_question.billionairehub_server as _; +import ballerina_exercism/http_billion_dollar_question.billionairehub_client as billionairehubClient; -configurable string clientId = ?; -configurable string clientSecret = ?; - -public function main() returns error? { - billionairehub:Client cl = check new ({auth: {clientId, clientSecret}}); - billionairehub:Billionaire[] billionaires = check cl->getBillionaires("France"); - io:println(billionaires); - - map industries = {}; - check from var b in billionaires - do { - industries[b.industry] = true; - }; - io:println(industries.keys()); -} +type Billionaire record {| + string name; + float netWorth; +|}; public function getTopXBillionaires(string[] countries, int x) returns string[]|error { - billionairehub:Billionaire[] billionaires = []; + Billionaire[] billionaires = []; foreach string country in countries { billionaires.push(...check getTopXBillionairesByCountry(country, x)); } @@ -29,9 +18,9 @@ public function getTopXBillionaires(string[] countries, int x) returns string[]| select b.name; } -function getTopXBillionairesByCountry(string country, int x) returns billionairehub:Billionaire[]|error { - billionairehub:Client cl = check new ({auth: {clientId, clientSecret}}); - billionairehub:Billionaire[] billionaires = check cl->getBillionaires(country); +function getTopXBillionairesByCountry(string country, int x) returns Billionaire[]|error { + billionairehubClient:BillionaireClient cl = check new(); + Billionaire[] billionaires = check cl->getBillionaires(country); return from var b in billionaires order by b.netWorth descending limit x diff --git a/exercises/practice/http-billion-dollar-question/Dependencies.toml b/exercises/practice/http-billion-dollar-question/Dependencies.toml index 2cea5375..b9ce7771 100644 --- a/exercises/practice/http-billion-dollar-question/Dependencies.toml +++ b/exercises/practice/http-billion-dollar-question/Dependencies.toml @@ -5,11 +5,12 @@ [ballerina] dependencies-toml-version = "2" +distribution-version = "2201.5.0" [[package]] org = "ballerina" name = "auth" -version = "2.3.1" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,17 +23,26 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.2.2" +version = "3.4.0" dependencies = [ + {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "task"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "constraint" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + [[package]] org = "ballerina" name = "crypto" -version = "2.2.2" +version = "2.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -41,7 +51,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.3.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -54,10 +64,11 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.3.1" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, @@ -77,11 +88,14 @@ dependencies = [ {org = "ballerina", name = "time"}, {org = "ballerina", name = "url"} ] +modules = [ + {org = "ballerina", packageName = "http", moduleName = "http"} +] [[package]] org = "ballerina" name = "io" -version = "1.3.0" +version = "1.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -98,7 +112,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.3.1" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -141,7 +155,9 @@ org = "ballerina" name = "lang.int" version = "0.0.0" dependencies = [ - {org = "ballerina", name = "jballerina.java"} + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"}, + {org = "ballerina", name = "lang.object"} ] [[package]] @@ -149,6 +165,14 @@ org = "ballerina" name = "lang.object" version = "0.0.0" +[[package]] +org = "ballerina" +name = "lang.regexp" +version = "0.0.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + [[package]] org = "ballerina" name = "lang.runtime" @@ -162,7 +186,8 @@ org = "ballerina" name = "lang.string" version = "0.0.0" dependencies = [ - {org = "ballerina", name = "jballerina.java"} + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.regexp"} ] [[package]] @@ -176,7 +201,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.3.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -187,7 +212,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.3.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -197,19 +222,20 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.3.1" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"} + {org = "ballerina", name = "time"}, + {org = "ballerina", name = "url"} ] [[package]] org = "ballerina" name = "observe" -version = "1.0.5" +version = "1.0.7" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -217,15 +243,16 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.3.0" +version = "1.6.0" dependencies = [ + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} ] [[package]] org = "ballerina" name = "regex" -version = "1.3.0" +version = "1.4.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.string"} @@ -234,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.2.2" +version = "2.3.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -255,7 +282,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.2.2" +version = "2.2.4" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -263,7 +290,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.2.2" +version = "2.2.3" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -272,38 +299,14 @@ dependencies = [ org = "ballerina_exercism" name = "http_billion_dollar_question" version = "0.1.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "test"}, - {org = "ballerinai", name = "observe"}, - {org = "ims", name = "billionairehub"} -] -modules = [ - {org = "ballerina_exercism", packageName = "http_billion_dollar_question", moduleName = "http_billion_dollar_question"} -] - -[[package]] -org = "ballerinai" -name = "observe" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "observe"} -] -modules = [ - {org = "ballerinai", packageName = "observe", moduleName = "observe"} -] - -[[package]] -org = "ims" -name = "billionairehub" -version = "1.0.0" dependencies = [ {org = "ballerina", name = "http"}, - {org = "ballerina", name = "url"} + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "test"} ] modules = [ - {org = "ims", packageName = "billionairehub", moduleName = "billionairehub"} + {org = "ballerina_exercism", packageName = "http_billion_dollar_question", moduleName = "http_billion_dollar_question"}, + {org = "ballerina_exercism", packageName = "http_billion_dollar_question", moduleName = "http_billion_dollar_question.billionairehub_client"}, + {org = "ballerina_exercism", packageName = "http_billion_dollar_question", moduleName = "http_billion_dollar_question.billionairehub_server"} ] - diff --git a/exercises/practice/http-billion-dollar-question/main.bal b/exercises/practice/http-billion-dollar-question/main.bal index 0e9cb1be..c912131c 100644 --- a/exercises/practice/http-billion-dollar-question/main.bal +++ b/exercises/practice/http-billion-dollar-question/main.bal @@ -1,12 +1,18 @@ -import ims/billionairehub; +import ballerina_exercism/http_billion_dollar_question.billionairehub_server as _; +import ballerina_exercism/http_billion_dollar_question.billionairehub_client as billionairehubClient; -# Client ID and Client Secret to connect to the billionaire API -configurable string clientId = ?; -configurable string clientSecret = ?; +type Billionaire record {| + string name; + float netWorth; +|}; +# Returns the top billionaires of the given countries. +# +# + countries - countries to search for billionaires +# + x - number of billionaires to return +# + return - list of billionaires public function getTopXBillionaires(string[] countries, int x) returns string[]|error { - // Create the client connector - billionairehub:Client cl = check new ({auth: {clientId, clientSecret}}); + billionairehubClient:BillionaireClient cl = check new; // TODO Write your logic here return []; diff --git a/exercises/practice/http-billion-dollar-question/modules/billionairehub_client/client.bal b/exercises/practice/http-billion-dollar-question/modules/billionairehub_client/client.bal new file mode 100644 index 00000000..49e8cf7d --- /dev/null +++ b/exercises/practice/http-billion-dollar-question/modules/billionairehub_client/client.bal @@ -0,0 +1,20 @@ +import ballerina/http; + +type Billionaire record {| + string name; + float netWorth; +|}; + +const CLIENT_URL = "http://localhost:9090"; + +public client class BillionaireClient { + private final http:Client httpClient; + + public function init() returns error? { + self.httpClient = check new (CLIENT_URL); + } + + remote function getBillionaires(string country) returns Billionaire[]|error { + return self.httpClient->/getBillionaires(country=country); + } +} diff --git a/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/resources/billionaires.json b/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/resources/billionaires.json new file mode 100644 index 00000000..748e088a --- /dev/null +++ b/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/resources/billionaires.json @@ -0,0 +1 @@ +{"United States":[{"name":"Elon Musk", "netWorth":177}, {"name":"Jeff Bezos", "netWorth":151}, {"name":"Bill Gates", "netWorth":124}, {"name":"Mark Zuckerberg", "netWorth":97}, {"name":"Larry Ellison", "netWorth":93}, {"name":"Larry Page", "netWorth":91.5}, {"name":"Sergey Brin", "netWorth":89}, {"name":"Warren Buffett", "netWorth":88}, {"name":"Steve Ballmer", "netWorth":68}, {"name":"Mukesh Ambani", "netWorth":84}], "China":[{"name":"Zhong Shanshan", "netWorth":68}, {"name":"Zhang Yiming", "netWorth":35}, {"name":"Ma Huateng", "netWorth":65}, {"name":"Jack Ma", "netWorth":48}, {"name":"Colin Huang", "netWorth":55}, {"name":"Pony Ma", "netWorth":55}, {"name":"He Xiangjian", "netWorth":43}, {"name":"Yang Huiyan & family", "netWorth":29}, {"name":"Wang Xing", "netWorth":27}, {"name":"William Lei Ding", "netWorth":27}], "India":[{"name":"Mukesh Ambani", "netWorth":84}, {"name":"Gautam Adani & family", "netWorth":50}, {"name":"Shiv Nadar", "netWorth":23}, {"name":"Radhakishan Damani", "netWorth":16}, {"name":"Lakshmi Mittal", "netWorth":18}, {"name":"Hinduja brothers", "netWorth":17}, {"name":"Cyrus Poonawalla", "netWorth":12}, {"name":"Uday Kotak", "netWorth":15}, {"name":"Sunil Mittal & family", "netWorth":11}, {"name":"Kumar Birla", "netWorth":10}], "Japan":[{"name":"Tadashi Yanai & family", "netWorth":31}, {"name":"Takemitsu Takizaki", "netWorth":28}, {"name":"Masayoshi Son", "netWorth":29}, {"name":"Nobutada Saji & family", "netWorth":28}, {"name":"Takemitsu Takizaki", "netWorth":28}, {"name":"Hiroshi Mikitani", "netWorth":24}, {"name":"Yasumitsu Shigeta", "netWorth":24}, {"name":"Takemitsu Takizaki", "netWorth":28}, {"name":"Takemitsu Takizaki", "netWorth":28}, {"name":"Takemitsu Takizaki", "netWorth":28}], "Hong Kong":[{"name":"Li Ka-shing", "netWorth":35}, {"name":"Lee Shau Kee", "netWorth":28}, {"name":"Raymond Kwok & family", "netWorth":17}, {"name":"Thomas Kwok & family", "netWorth":17}, {"name":"Peter Woo", "netWorth":14}, {"name":"Joseph Lau", "netWorth":17}, {"name":"Cheng Yu-tung & family", "netWorth":17}, {"name":"Lui Che Woo & family", "netWorth":15}, {"name":"Henry Cheng & family", "netWorth":15}, {"name":"Michael Kadoorie & family", "netWorth":13}], "Russia":[{"name":"Vladimir Lisin", "netWorth":24}, {"name":"Vladimir Potanin", "netWorth":23}, {"name":"Alexey Mordashov & family", "netWorth":22}, {"name":"Leonid Mikhelson", "netWorth":20}, {"name":"Gennady Timchenko", "netWorth":20}, {"name":"Vagit Alekperov", "netWorth":19}, {"name":"Alisher Usmanov", "netWorth":19}, {"name":"Viktor Vekselberg", "netWorth":17}, {"name":"Roman Abramovich", "netWorth":17}, {"name":"Andrey Melnichenko", "netWorth":16}], "Italy":[{"name":"Leonardo Del Vecchio & family", "netWorth":25}, {"name":"Stefano Pessina", "netWorth":12}, {"name":"Massimiliana Landini Aleotti & family", "netWorth":13}, {"name":"Giovanni Ferrero", "netWorth":35}, {"name":"Giorgio Armani", "netWorth":8}, {"name":"Sergio Marchionne", "netWorth":5}, {"name":"Stefano Pessina", "netWorth":12}, {"name":"Massimiliana Landini Aleotti & family", "netWorth":13}, {"name":"Giovanni Ferrero", "netWorth":35}, {"name":"Giorgio Armani", "netWorth":8}], "France":[{"name":"Bernard Arnault & family", "netWorth":150}, {"name":"Francoise Bettencourt Meyers & family", "netWorth":71}, {"name":"Francois Pinault & family", "netWorth":42}, {"name":"Alain Wertheimer", "netWorth":33}, {"name":"Gerard Wertheimer", "netWorth":33}, {"name":"Serge Dassault & family", "netWorth":26}, {"name":"Patrick Drahi", "netWorth":21}, {"name":"Xavier Niel", "netWorth":13}, {"name":"Alain Merieux & family", "netWorth":7}, {"name":"Vincent Bollore", "netWorth":7}], "Germany":[{"name":"Beate Heister & Karl Albrecht Jr.", "netWorth":39}, {"name":"Dieter Schwarz", "netWorth":35}, {"name":"Susanne Klatten", "netWorth":29}, {"name":"Stefan Quandt", "netWorth":29}, {"name":"Heinz Hermann Thiele & family", "netWorth":22}, {"name":"Klaus-Michael Kuhne", "netWorth":20}, {"name":"August von Finck", "netWorth":20}, {"name":"Michael Otto & family", "netWorth":19}, {"name":"Hasso Plattner & family", "netWorth":15}, {"name":"Reinhold Wurth & family", "netWorth":12}], "Australia":[{"name":"Gina Rinehart", "netWorth":31}, {"name":"Andrew Forrest", "netWorth":23}, {"name":"Anthony Pratt & family", "netWorth":19}, {"name":"James Packer", "netWorth":3}, {"name":"Harry Triguboff", "netWorth":12}, {"name":"Frank Lowy", "netWorth":6}, {"name":"John Gandel", "netWorth":6}, {"name":"Stan Perron", "netWorth":2}, {"name":"Kerr Neilson", "netWorth":2}, {"name":"Lindsay Fox", "netWorth":2}], "Indonesia":[{"name":"Robert Budi Hartono", "netWorth":20}, {"name":"Michael Hartono", "netWorth":20}, {"name":"Sri Prakash Lohia", "netWorth":13}, {"name":"Eka Tjipta Widjaja & family", "netWorth":9}, {"name":"Anthoni Salim & family", "netWorth":7}, {"name":"Tahir", "netWorth":4}, {"name":"Sukanto Tanoto", "netWorth":4}, {"name":"Peter Sondakh", "netWorth":3}, {"name":"Low Tuck Kwong", "netWorth":3}, {"name":"Putera Sampoerna", "netWorth":3}], "Canada":[{"name":"David Thomson & family", "netWorth":39}, {"name":"Joseph Tsai", "netWorth":10}, {"name":"Galen Weston & family", "netWorth":10}, {"name":"James Irving", "netWorth":8}, {"name":"Jim Pattison", "netWorth":7}, {"name":"Emanuele (Lino) Saputo", "netWorth":5}, {"name":"Alain Bouchard", "netWorth":4}, {"name":"Charles Bronfman", "netWorth":2}, {"name":"Michael Lee-Chin", "netWorth":2}, {"name":"Daryl Katz", "netWorth":2}], "Finland":[{"name":"Antti Herlin & family", "netWorth":13}, {"name":"Heikki Kyostila", "netWorth":5}, {"name":"Ilkka Herlin", "netWorth":4}, {"name":"Mika Anttonen", "netWorth":3}, {"name":"Niklas Herlin", "netWorth":3}, {"name":"Ilona Herlin", "netWorth":3}, {"name":"Ilkka Paananen", "netWorth":2}, {"name":"Hannu Haukka", "netWorth":2}, {"name":"Matti Marjanen", "netWorth":2}, {"name":"Mika Ihamuotila", "netWorth":2}], "Mexico":[{"name":"Carlos Slim Helu & family", "netWorth":52}, {"name":"German Larrea Mota Velasco & family", "netWorth":27}, {"name":"Alberto Bailleres Gonzalez & family", "netWorth":10}, {"name":"Ricardo Salinas Pliego & family", "netWorth":9}, {"name":"Maria Asuncion Aramburuzabala & family", "netWorth":5}, {"name":"Juan Francisco Beckmann Vidal & family", "netWorth":5}, {"name":"Roberto Hernandez Ramirez & family", "netWorth":4}, {"name":"Carlos Hank Rhon", "netWorth":2}, {"name":"Antonio del Valle Ruiz & family", "netWorth":2}, {"name":"Carlos Peralta Quintero", "netWorth":2}]} \ No newline at end of file diff --git a/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/server.bal b/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/server.bal new file mode 100644 index 00000000..4a93e468 --- /dev/null +++ b/exercises/practice/http-billion-dollar-question/modules/billionairehub_server/server.bal @@ -0,0 +1,23 @@ +import ballerina/http; +import ballerina/io; + +type Billionaire record {| + string name; + float netWorth; +|}; + +service / on new http:Listener(9090) { + map topbillionaires = {}; + + resource function get getBillionaires(string country) returns Billionaire[]|error { + if self.topbillionaires.length() == 0 { + json billionaireDetails = check io:fileReadJson("modules/billionairehub_server/resources/billionaires.json"); + self.topbillionaires = check billionaireDetails.cloneWithType(); + } + Billionaire[]? billionaires = self.topbillionaires[country]; + if billionaires is Billionaire[] { + return billionaires; + } + return error(country + " is not found in the sample dataset."); + } +} diff --git a/exercises/practice/http-billion-dollar-question/tests/Config.toml b/exercises/practice/http-billion-dollar-question/tests/Config.toml deleted file mode 100644 index fa187f36..00000000 --- a/exercises/practice/http-billion-dollar-question/tests/Config.toml +++ /dev/null @@ -1,2 +0,0 @@ -clientId = "V5bhO97JalSWqUMcItOuKzhf1pca" -clientSecret = "eeXDwSQOfX_WZ2PMaD2rvOjyCTga" diff --git a/exercises/practice/http-billion-dollar-question/tests/tests.bal b/exercises/practice/http-billion-dollar-question/tests/tests.bal index b0feb3a6..e71a322e 100644 --- a/exercises/practice/http-billion-dollar-question/tests/tests.bal +++ b/exercises/practice/http-billion-dollar-question/tests/tests.bal @@ -24,22 +24,22 @@ function validData() returns map<[string[], int, string[]]> { "case2": [ ["China", "India"], 5, - ["Mukesh Ambani", "Gautam Adani & family", "Zhong Shanshan", "Zhang Yiming", "Ma Huateng"] + ["Mukesh Ambani","Zhong Shanshan","Ma Huateng","Colin Huang","Pony Ma"] ], "case3": [ ["China", "India", "Japan", "Hong Kong"], 10, - ["Mukesh Ambani", "Gautam Adani & family", "Zhong Shanshan", "Zhang Yiming", "Robin Zeng", "Ma Huateng", "Li Ka-shing", "Lee Shau Kee", "Shiv Nadar", "He Xiangjian"] + ["Mukesh Ambani","Zhong Shanshan","Ma Huateng","Colin Huang","Pony Ma","Gautam Adani & family","Jack Ma","He Xiangjian","Zhang Yiming","Li Ka-shing"] ], "case4": [ ["Russia", "Italy", "France", "Germany", "Australia"], 3, - ["Bernard Arnault & family", "Francoise Bettencourt Meyers & family", "Dieter Schwarz"] + ["Bernard Arnault & family","Francoise Bettencourt Meyers & family","Francois Pinault & family"] ], "case5": [ ["Indonesia", "Japan", "Hong Kong"], 7, - ["Robin Zeng", "Li Ka-shing", "Lee Shau Kee", "Tadashi Yanai & family", "Takemitsu Takizaki", "R. Budi Hartono", "Michael Hartono"] + ["Li Ka-shing","Tadashi Yanai & family","Masayoshi Son","Takemitsu Takizaki","Nobutada Saji & family","Takemitsu Takizaki","Takemitsu Takizaki"] ], "case6": [ ["India"], @@ -49,7 +49,7 @@ function validData() returns map<[string[], int, string[]]> { "case7": [ ["Russia"], 3, - ["Vladimir Lisin", "Vladimir Potanin"] + ["Vladimir Lisin","Vladimir Potanin","Alexey Mordashov & family"] ], "case8": [ ["Mexico"], @@ -59,7 +59,7 @@ function validData() returns map<[string[], int, string[]]> { "case9": [ ["Canada", "Finland"], 2, - ["Changpeng Zhao", "David Thomson & family"] + ["David Thomson & family","Antti Herlin & family"] ] }; }