X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tests%2Flib%2Fmocklib%2Fuci.uc;h=aa7108a85ce42b6ba37a27e630f56506d8ee19c9;hb=fde80708d63d54be18037c598d1e6aef0c65ca08;hp=ed6b610229cc5f105310193b46cadb4a421e0a31;hpb=53caa1a762125a71389a486aa913e4fbdf3650cf;p=project%2Ffirewall4.git

diff --git a/tests/lib/mocklib/uci.uc b/tests/lib/mocklib/uci.uc
index ed6b610..aa7108a 100644
--- a/tests/lib/mocklib/uci.uc
+++ b/tests/lib/mocklib/uci.uc
@@ -1,154 +1,153 @@
-{%
-	let mocklib = global.mocklib;
+let mocklib = global.mocklib;
 
-	let byte = (str, off) => {
-		let v = ord(str, off);
-		return length(v) ? v[0] : v;
-	};
+let byte = (str, off) => {
+	let v = ord(str, off);
+	return length(v) ? v[0] : v;
+};
 
-	let hash = (s) => {
-		let h = 7;
+let hash = (s) => {
+	let h = 7;
 
-		for (let i = 0; i < length(s); i++)
-			h = h * 31 + byte(s, i);
+	for (let i = 0; i < length(s); i++)
+		h = h * 31 + byte(s, i);
 
-		return h;
-	};
+	return h;
+};
 
-	let id = (config, t, n) => {
-		while (true) {
-			let id = sprintf('cfg%08x', hash(t + n));
+let id = (config, t, n) => {
+	while (true) {
+		let id = sprintf('cfg%08x', hash(t + n));
 
-			if (!exists(config, id))
-				return id;
+		if (!exists(config, id))
+			return id;
 
-			n++;
-		}
-	};
-
-	let fixup_config = (config) => {
-		let rv = {};
-		let n_section = 0;
+		n++;
+	}
+};
 
-		for (let stype in config) {
-			switch (type(config[stype])) {
-			case 'object':
-				config[stype] = [ config[stype] ];
-				/* fall through */
+let fixup_config = (config) => {
+	let rv = {};
+	let n_section = 0;
 
-			case 'array':
-				for (let idx, sobj in config[stype]) {
-					let sid, anon;
+	for (let stype in config) {
+		switch (type(config[stype])) {
+		case 'object':
+			config[stype] = [ config[stype] ];
+			/* fall through */
 
-					if (exists(sobj, '.name') && !exists(rv, sobj['.name'])) {
-						sid = sobj['.name'];
-						anon = false;
-					}
-					else {
-						sid = id(rv, stype, idx);
-						anon = true;
-					}
+		case 'array':
+			for (let idx, sobj in config[stype]) {
+				let sid, anon;
 
-					rv[sid] = {
-						'.index': n_section++,
-						...sobj,
-						'.name': sid,
-						'.type': stype,
-						'.anonymous': anon
-					};
+				if (exists(sobj, '.name') && !exists(rv, sobj['.name'])) {
+					sid = sobj['.name'];
+					anon = false;
+				}
+				else {
+					sid = id(rv, stype, idx);
+					anon = true;
 				}
 
-				break;
+				rv[sid] = {
+					'.index': n_section++,
+					...sobj,
+					'.name': sid,
+					'.type': stype,
+					'.anonymous': anon
+				};
 			}
+
+			break;
 		}
+	}
 
-		for (let n, sid in sort(keys(rv), (a, b) => rv[a]['.index'] - rv[b]['.index']))
-			rv[sid]['.index'] = n;
+	for (let n, sid in sort(keys(rv), (a, b) => rv[a]['.index'] - rv[b]['.index']))
+		rv[sid]['.index'] = n;
 
-		return rv;
-	};
+	return rv;
+};
 
-	return {
-		cursor: () => ({
-			_configs: {},
+return {
+	cursor: () => ({
+		_configs: {},
 
-			load: function(file) {
-				let basename = replace(file, /^.+\//, ''),
-				    path = sprintf("uci/%s.json", basename),
-				    mock = mocklib.read_json_file(path);
+		load: function(file) {
+			let basename = replace(file, /^.+\//, ''),
+			    path = sprintf("uci/%s.json", basename),
+			    mock = mocklib.read_json_file(path);
 
-				if (!mock || mock != mock) {
-					mocklib.I("No configuration fixture defined for uci package %s.", file);
-					mocklib.I("Provide a mock configuration through the following JSON file:\n%s\n", path);
+			if (!mock || mock != mock) {
+				mocklib.I("No configuration fixture defined for uci package %s.", file);
+				mocklib.I("Provide a mock configuration through the following JSON file:\n%s\n", path);
 
+				return null;
+			}
+
+			this._configs[basename] = fixup_config(mock);
+		},
+
+		_get_section: function(config, section) {
+			if (!exists(this._configs, config)) {
+				this.load(config);
+
+				if (!exists(this._configs, config))
 					return null;
-				}
+			}
 
-				this._configs[basename] = fixup_config(mock);
-			},
+			let cfg = this._configs[config],
+			    extended = match(section, "^@([A-Za-z0-9_-]+)\[(-?[0-9]+)\]$");
 
-			_get_section: function(config, section) {
-				if (!exists(this._configs, config)) {
-					this.load(config);
+			if (extended) {
+				let stype = extended[1],
+				    sindex = +extended[2];
 
-					if (!exists(this._configs, config))
-						return null;
-				}
+				let sids = sort(
+					filter(keys(cfg), sid => cfg[sid]['.type'] == stype),
+					(a, b) => cfg[a]['.index'] - cfg[b]['.index']
+				);
 
-				let cfg = this._configs[config],
-				    extended = match(section, "^@([A-Za-z0-9_-]+)\[(-?[0-9]+)\]$");
+				if (sindex < 0)
+					sindex = sids.length + sindex;
 
-				if (extended) {
-					let stype = extended[1],
-					    sindex = +extended[2];
+				return cfg[sids[sindex]];
+			}
 
-					let sids = sort(
-						filter(keys(cfg), sid => cfg[sid]['.type'] == stype),
-						(a, b) => cfg[a]['.index'] - cfg[b]['.index']
-					);
+			return cfg[section];
+		},
 
-					if (sindex < 0)
-						sindex = sids.length + sindex;
+		get: function(config, section, option) {
+			let sobj = this._get_section(config, section);
 
-					return cfg[sids[sindex]];
-				}
+			if (option && index(option, ".") == 0)
+				return null;
+			else if (sobj && option)
+				return sobj[option];
+			else if (sobj)
+				return sobj[".type"];
+		},
 
-				return cfg[section];
-			},
+		get_all: function(config, section) {
+			return section ? this._get_section(config, section) : this._configs[config];
+		},
 
-			get: function(config, section, option) {
-				let sobj = this._get_section(config, section);
+		foreach: function(config, stype, cb) {
+			let rv = false;
 
-				if (option && index(option, ".") == 0)
-					return null;
-				else if (sobj && option)
-					return sobj[option];
-				else if (sobj)
-					return sobj[".type"];
-			},
-
-			get_all: function(config, section) {
-				return section ? this._get_section(config, section) : this._configs[config];
-			},
-
-			foreach: function(config, stype, cb) {
-				let rv = false;
-
-				if (exists(this._configs, config)) {
-					let cfg = this._configs[config],
-					    sids = sort(keys(cfg), (a, b) => cfg[a]['.index'] - cfg[b]['.index']);
-
-					for (let i, sid in sids) {
-						if (stype == null || cfg[sid]['.type'] == stype) {
-							if (cb({ ...(cfg[sid]) }) === false)
-								break;
-
-							rv = true;
-						}
+			if (exists(this._configs, config)) {
+				let cfg = this._configs[config],
+				    sids = sort(keys(cfg), (a, b) => cfg[a]['.index'] - cfg[b]['.index']);
+
+				for (let i, sid in sids) {
+					if (stype == null || cfg[sid]['.type'] == stype) {
+						if (cb({ ...(cfg[sid]) }) === false)
+							break;
+
+						rv = true;
 					}
 				}
-
-				return rv;
 			}
-		})
-	};
+
+			return rv;
+		}
+	})
+};