test parseTimestamp and remove unused functions (fe59d9c0) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-unittests.js

+20 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ FnordMetric.UnitTests = function() {

		var testParseQueryString = function() {
		function test(querystr, expected) {
		results++;
		results.total++;
		var result = FnordMetric.util.parseQueryString(querystr);
		result = JSON.stringify(result);
		expected = JSON.stringify(expected);
		@@ -55,7 +55,7 @@ FnordMetric.UnitTests = function() {

		var testSetUrlQueryString = function() {
		function test(hash, query_params, encode, push_state, expected) {
		results++;
		results.total++;
		FnordMetric.util.setURLQueryString(hash, query_params, encode, push_state);
		var result = window.location.hash;
		if (result != expected) {
		@@ -88,4 +88,22 @@ FnordMetric.UnitTests = function() {
		test("", {}, false, false, "");
		}();

		var testParseTimestamp = function() {
		function test(timestamp, expected) {
		results.total++;
		var result = FnordMetric.util.parseTimestamp(timestamp);
		if (result.substr(0,13) != expected) {
		results.bad++;
		console.log("Testing parseTimestamp expected " +
		expected + ", but was " + result.substr(0,12));
		}
		}
		var now = Date.now();
		test(now, "0 seconds ago");
		test(now *1000, "0 seconds ago")
		test(Math.floor(now / 1000), "0 seconds ago");
		}();

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

		}

+20 −11

Original line number	Diff line number	Diff line
		@@ -145,8 +145,6 @@ FnordMetric.util.displayErrorMessage = function(elem, msg) {
		}




		FnordMetric.util.renderPageHeader = function(text, elem) {
		var header = document.createElement("h1");
		header.className = "page_header";
		@@ -155,13 +153,19 @@ FnordMetric.util.renderPageHeader = function(text, elem) {
		elem.appendChild(header);
		}

		/**
		* creates a time description like
		* '2 hours ago - Nov 8 2014 11:33:11
		* @param timestamp unix ts in seconds, milli or microseconds
		*/
		FnordMetric.util.parseTimestamp = function(timestamp) {
		if (timestamp == 0) {
		return "0";
		}
		var timestamp =
		FnordMetric.util.convertToMilliTS(timestamp);

		var time_str;
		var timestamp = timestamp / 1000;
		var now = Date.now();
		var date = new Date(timestamp);

		@@ -208,6 +212,18 @@ FnordMetric.util.parseTimestamp = function(timestamp) {
		return time_str;
		}

		//FIXLAURA check all cases
		FnordMetric.util.convertToMilliTS = function(ts) {
		var length = ts.toString().length;
		if (length == 16) {
		return (ts/1000);
		} else if (length < 13 && length >= 10) {
		return (ts * 1000);
		} else {
		return ts;
		}
		}

		FnordMetric.util.parseMilliTS = function(ts) {
		if (ts < 1000) {
		if (ts == 0) {
		@@ -233,14 +249,7 @@ FnordMetric.util.parseMilliTS = function(ts) {
		return (ts + (ts == 1? " hour" : " hours"));
		}

		FnordMetric.util.humanDateToMikroTS = function(date) {
		/* first version until datepicker is implemented */
		var ts;
		if (date == "NOW") {
		ts = Date.now();
		}
		return ts;
		}



		FnordMetric.util.humanCountRows = function(tables) {