AMBARI-3069. Fix Unit tests. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/0a7c5d7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0a7c5d7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0a7c5d7a Branch: refs/heads/trunk Commit: 0a7c5d7a787fd5b6568f09aca3f698305602ddfa Parents: b942f7b Author: Oleg Nechiporenko <[email protected]> Authored: Mon Sep 2 17:49:09 2013 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Tue Sep 3 19:51:54 2013 +0300 ---------------------------------------------------------------------- ambari-web/test/utils/config_test.js | 4 ++-- .../views/main/dashboard/widgets/jobtracker_rpc_test.js | 12 ++++++------ .../views/main/dashboard/widgets/namenode_cpu_test.js | 6 +++--- .../views/main/dashboard/widgets/namenode_rpc_test.js | 12 ++++++------ .../main/dashboard/widgets/pie_chart_widget_test.js | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a7c5d7a/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index 2160347..1ac31b8 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -36,9 +36,9 @@ describe('App.config', function () { } expect(App.config.identifyCategory(data).name).to.equal('AdvancedCoreSite'); }); - it('should return "CapacityScheduler" if filename "capacity-scheduler.xml" and serviceName "MAPREDUCE"', function () { + it('should return "CapacityScheduler" if filename "capacity-scheduler.xml" and serviceName "YARN"', function () { data = { - serviceName: 'MAPREDUCE', + serviceName: 'YARN', filename: 'capacity-scheduler.xml' } expect(App.config.identifyCategory(data).name).to.equal('CapacityScheduler'); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a7c5d7a/ambari-web/test/views/main/dashboard/widgets/jobtracker_rpc_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/dashboard/widgets/jobtracker_rpc_test.js b/ambari-web/test/views/main/dashboard/widgets/jobtracker_rpc_test.js index c1ef319..3f85408 100644 --- a/ambari-web/test/views/main/dashboard/widgets/jobtracker_rpc_test.js +++ b/ambari-web/test/views/main/dashboard/widgets/jobtracker_rpc_test.js @@ -44,9 +44,9 @@ describe('App.JobTrackerRpcView', function() { jobTrackerRpc: 10 }, e: { - isRed: false, + isRed: true, isOrange: false, - isGreen: true, + isGreen: false, isNA: false, content: '10.00 ms', data: '10.00' @@ -57,9 +57,9 @@ describe('App.JobTrackerRpcView', function() { jobTrackerRpc: 0 }, e: { - isRed: true, + isRed: false, isOrange: false, - isGreen: false, + isGreen: true, isNA: false, content: '0 ms', data: 0 @@ -70,9 +70,9 @@ describe('App.JobTrackerRpcView', function() { jobTrackerRpc: null }, e: { - isRed: true, + isRed: false, isOrange: false, - isGreen: false, + isGreen: true, isNA: true, content: Em.I18n.t('services.service.summary.notAvailable'), data: null http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a7c5d7a/ambari-web/test/views/main/dashboard/widgets/namenode_cpu_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/dashboard/widgets/namenode_cpu_test.js b/ambari-web/test/views/main/dashboard/widgets/namenode_cpu_test.js index 5852c2b..7d1ffec 100644 --- a/ambari-web/test/views/main/dashboard/widgets/namenode_cpu_test.js +++ b/ambari-web/test/views/main/dashboard/widgets/namenode_cpu_test.js @@ -77,21 +77,21 @@ describe('App.NameNodeCpuPieChartView', function() { model: Em.Object.create({ used: 0 }), - e: ['0.0', 100], + e: ['0.0', '0.00'], m: 'Nothing is used' }, { model: Em.Object.create({ used: 100 }), - e: ['100.0', 0], + e: ['100.0', '100.00'], m: 'All is used' }, { model: Em.Object.create({ used: 50 }), - e: ['50.0', 50], + e: ['50.0', '50.00'], m: 'Half is used' } ]; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a7c5d7a/ambari-web/test/views/main/dashboard/widgets/namenode_rpc_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/dashboard/widgets/namenode_rpc_test.js b/ambari-web/test/views/main/dashboard/widgets/namenode_rpc_test.js index 14016e8..992b537 100644 --- a/ambari-web/test/views/main/dashboard/widgets/namenode_rpc_test.js +++ b/ambari-web/test/views/main/dashboard/widgets/namenode_rpc_test.js @@ -44,9 +44,9 @@ describe('App.NameNodeRpcView', function() { nameNodeRpc: 10 }, e: { - isRed: false, + isRed: true, isOrange: false, - isGreen: true, + isGreen: false, isNA: false, content: '10.00 ms', data: '10.00' @@ -57,9 +57,9 @@ describe('App.NameNodeRpcView', function() { nameNodeRpc: 0 }, e: { - isRed: true, + isRed: false, isOrange: false, - isGreen: false, + isGreen: true, isNA: false, content: '0 ms', data: 0 @@ -70,9 +70,9 @@ describe('App.NameNodeRpcView', function() { nameNodeRpc: null }, e: { - isRed: true, + isRed: false, isOrange: false, - isGreen: false, + isGreen: true, isNA: true, content: Em.I18n.t('services.service.summary.notAvailable'), data: null http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0a7c5d7a/ambari-web/test/views/main/dashboard/widgets/pie_chart_widget_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/dashboard/widgets/pie_chart_widget_test.js b/ambari-web/test/views/main/dashboard/widgets/pie_chart_widget_test.js index 05ae6e6..d77e6ab 100644 --- a/ambari-web/test/views/main/dashboard/widgets/pie_chart_widget_test.js +++ b/ambari-web/test/views/main/dashboard/widgets/pie_chart_widget_test.js @@ -137,7 +137,7 @@ describe('App.PieChartDashboardWidgetView', function() { max: 10, used: 0 }), - e: ['0', 100], + e: ['0', '0.0'], m: 'Nothing is used' }, { @@ -145,7 +145,7 @@ describe('App.PieChartDashboardWidgetView', function() { max: 10, used: 10 }), - e: ['100', 0], + e: ['100', '100.0'], m: 'All is used' }, { @@ -153,7 +153,7 @@ describe('App.PieChartDashboardWidgetView', function() { max: 10, used: 5 }), - e: ['50', 50], + e: ['50', '50.0'], m: 'Half is used' } ];
