test, fix and remove unused functions (cf27a1d2) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-unittests.js

+47 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,53 @@ FnordMetric.UnitTests = function() {
		test(Math.floor(now / 1000), "0 seconds ago");
		}();

		var testSortMetricList = function() {
		function test(metrics, column_index, order, expected) {
		results.total++;
		FnordMetric.util.sortMetricList(metrics, column_index, order);
		var result = metrics;
		if (result[0][column_index] != expected[0][column_index]) {
		results.bad++;
		console.log("Testing sortMetricList expected "
		+ expected[0][column_index] + ", but was " + result[0][column_index]);
		}
		}
		var metric1 = [
		"/osx/load_avg_15m", "host", "5 hours ago - Nov 18 2014 11:33:11", 10693668];
		var metric2 = [
		"/osx/load_avg_5m", "", "5 hours ago - Nov 18 2014 11:33:12", 10693669];

		test([metric1, metric2], 0, "asc", [metric1, metric2]);
		test([metric1, metric2], 0, "desc", [metric2, metric1]);
		test([metric1, metric1], 0, "asc", [metric1, metric1]);
		test([metric1, metric2], 2, "desc", [metric2, metric1]);
		test([metric1, metric2], 2, "asc", [metric1, metric2]);
		test([metric1, metric2], 1, "desc", [metric1, metric2]);

		}();

		var testSearchMetricList = function() {
		function test(metrics, search_item, expected) {
		results.total++;
		var result = FnordMetric.util.searchMetricList(metrics, search_item);
		for (var i = 0; i < result.length; i++) {
		if (JSON.stringify(result[i]) != JSON.stringify(expected[i])) {
		results.bad++;
		console.log("Testing setURLQueryString expected "
		+ expected[i] + ", but was " + result[i]);
		}
		}
		}
		var m1 = {key : "/osx/load_avg_15m", labels : "", last_insert : 123};
		var m2 = {key : "/osx/load 15m", labels : "" };
		var m3 = {key : undefined, labels : ""};
		var metrics = [m1, m2, m3];

		test(metrics, "15", [m1, m2]);
		test(metrics, 15, [m1, m2]);

		}();

		console.log(results.total + " tests, "+ results.bad + " failed.");

		}

fnordmetric-webui/fnordmetric-webui-util.js

+16 −6

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@ FnordMetric.util.convertToMilliTS = function(ts) {
		}

		FnordMetric.util.parseMilliTS = function(ts) {
		var ts = FnordMetric.util.convertToMilliTS(ts);
		if (ts < 1000) {
		if (ts == 0) {
		return " less than 1 millisecond";
		@@ -249,9 +250,6 @@ FnordMetric.util.parseMilliTS = function(ts) {
		return (ts + (ts == 1? " hour" : " hours"));
		}




		FnordMetric.util.humanCountRows = function(tables) {
		var num = 0;
		tables.map(function(table) {
		@@ -260,7 +258,13 @@ FnordMetric.util.humanCountRows = function(tables) {
		return (num == 1? num + " row" : num + " rows")
		}


		/**
		* sorts the metric list for a specific column
		* @param metrics is an array of arrays
		* @param column_index determines which 'column'
		* ar array index should be sorted
		* @param order can be asc or desc
		*/
		FnordMetric.util.sortMetricList = function(metrics, column_index, order) {
		function compare(a, b) {
		if (a < b) {
		@@ -340,13 +344,19 @@ FnordMetric.createButton = function(href, class_name, inner_HTML) {
		return button;
		}

		/**
		* returns those metric objects whose key includes search_item
		* @param metrics array of metric objects
		*/
		FnordMetric.util.searchMetricList = function(metrics, search_item) {
		//FIXME works but seems not to be the best solution
		var data = [];
		metrics.map(function(item) {
		if (item.key != undefined) {
		if (item.key.indexOf(search_item) > -1) {
		data.push(item);
		}
		}
		});
		return data;
		}

Admin message