Commit c31be6b1 authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta los tests al nuevo planteamiento

parent 25816f69
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -72,6 +73,7 @@ public class WindRoseControllerTest {

	private static HashMap<String, Object> query;

	@SuppressWarnings("serial")
	@BeforeClass
	public static void beforeClass() {

@@ -87,8 +89,14 @@ public class WindRoseControllerTest {

		// @formatter:off

		Integer speedDataDefinition = 20,
				directionDataDefinition = 19;
		List<Integer> speedDataDefinition = new ArrayList<Integer>() {{
			add(20);
			add(21);
		}},
		directionDataDefinition = new ArrayList<Integer>() {{
			add(18);
			add(19);
		}};
		
		// @formatter:on

@@ -97,6 +105,8 @@ public class WindRoseControllerTest {
		dataDefinition.put("direction", directionDataDefinition);
		terms.put("dataDefinition", dataDefinition);

		terms.put("timeInterval", 3600000);

		dataQuery.setTerms(terms);
	}

+1211 −1211

File changed.

Preview size limit exceeded, changes collapsed.

+86 −86
Original line number Diff line number Diff line
{
	"limits": [{
		"min": 0.0,
		"max": 4.217
		"max": 4.333
	}, {
		"min": 4.217,
		"max": 8.433
		"min": 4.333,
		"max": 8.667
	}, {
		"min": 8.433,
		"max": 12.65
		"min": 8.667,
		"max": 13.0
	}, {
		"min": 12.65,
		"max": 16.867
		"min": 13.0,
		"max": 17.333
	}, {
		"min": 16.867,
		"max": 21.083
		"min": 17.333,
		"max": 21.667
	}, {
		"min": 21.083,
		"max": 25.3
		"min": 21.667,
		"max": 26.0
	}],
	"data": [
		[{
			"value": 6.441
			"value": 5.043
		}, {
			"value": 3.633
			"value": 3.458
		}, {
			"value": 2.725
			"value": 2.738
		}, {
			"value": 0.908
			"value": 0.72
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.248
			"value": 0.576
		}, {
			"value": 1.652
			"value": 1.585
		}, {
			"value": 0.908
			"value": 0.72
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.165
			"value": 0.576
		}, {
			"value": 1.982
			"value": 2.017
		}, {
			"value": 0.826
			"value": 0.72
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.165
			"value": 0.288
		}, {
			"value": 1.486
			"value": 1.297
		}, {
			"value": 1.156
			"value": 1.729
		}, {
			"value": 0.413
			"value": 0.288
		}, {
			"value": 0.826
			"value": 0.576
		}, {
			"value": 0.083
			"value": 0.0
		}],
		[{
			"value": 0.578
			"value": 0.72
		}, {
			"value": 2.23
			"value": 1.441
		}, {
			"value": 1.073
			"value": 0.72
		}, {
			"value": 0.743
			"value": 0.576
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.33
			"value": 1.009
		}, {
			"value": 2.808
			"value": 2.161
		}, {
			"value": 1.486
			"value": 1.729
		}, {
			"value": 0.991
			"value": 1.009
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.661
			"value": 0.72
		}, {
			"value": 1.239
			"value": 2.017
		}, {
			"value": 2.147
			"value": 1.585
		}, {
			"value": 0.413
			"value": 0.72
		}, {
			"value": 0.33
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.413
			"value": 0.72
		}, {
			"value": 1.404
			"value": 1.873
		}, {
			"value": 0.578
			"value": 0.576
		}, {
			"value": 0.0
		}, {
@@ -124,11 +124,11 @@
			"value": 0.0
		}],
		[{
			"value": 0.991
			"value": 1.585
		}, {
			"value": 1.982
			"value": 1.585
		}, {
			"value": 0.661
			"value": 1.153
		}, {
			"value": 0.0
		}, {
@@ -137,11 +137,11 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 2.477
			"value": 1.873
		}, {
			"value": 0.991
			"value": 1.441
		}, {
			"value": 0.0
		}, {
@@ -150,80 +150,80 @@
			"value": 0.0
		}],
		[{
			"value": 0.33
			"value": 0.432
		}, {
			"value": 3.055
			"value": 2.882
		}, {
			"value": 1.652
			"value": 2.161
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 1.156
			"value": 1.009
		}, {
			"value": 5.945
			"value": 6.052
		}, {
			"value": 1.899
			"value": 1.873
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.661
			"value": 0.432
		}, {
			"value": 4.211
			"value": 4.323
		}, {
			"value": 3.716
			"value": 3.458
		}, {
			"value": 1.404
			"value": 1.441
		}, {
			"value": 0.991
			"value": 1.009
		}, {
			"value": 0.248
			"value": 0.432
		}],
		[{
			"value": 0.826
			"value": 0.432
		}, {
			"value": 1.982
			"value": 1.585
		}, {
			"value": 2.973
			"value": 3.458
		}, {
			"value": 3.303
			"value": 4.179
		}, {
			"value": 1.982
			"value": 1.873
		}, {
			"value": 0.248
			"value": 0.432
		}],
		[{
			"value": 0.413
			"value": 0.288
		}, {
			"value": 3.468
			"value": 2.882
		}, {
			"value": 1.734
			"value": 1.297
		}, {
			"value": 0.165
			"value": 0.576
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.248
			"value": 0.144
		}, {
			"value": 4.046
			"value": 4.035
		}, {
			"value": 1.652
			"value": 1.729
		}, {
			"value": 1.321
			"value": 1.441
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}]
+242 −242
Original line number Diff line number Diff line
{
	"limits": [{
		"min": 0.0,
		"max": 2.53
		"max": 2.6
	}, {
		"min": 2.53,
		"max": 5.06
		"min": 2.6,
		"max": 5.2
	}, {
		"min": 5.06,
		"max": 7.59
		"min": 5.2,
		"max": 7.8
	}, {
		"min": 7.59,
		"max": 10.12
		"min": 7.8,
		"max": 10.4
	}, {
		"min": 10.12,
		"max": 12.65
		"min": 10.4,
		"max": 13.0
	}, {
		"min": 12.65,
		"max": 15.18
		"min": 13.0,
		"max": 15.6
	}, {
		"min": 15.18,
		"max": 17.71
		"min": 15.6,
		"max": 18.2
	}, {
		"min": 17.71,
		"max": 20.24
		"min": 18.2,
		"max": 20.8
	}, {
		"min": 20.24,
		"max": 22.77
		"min": 20.8,
		"max": 23.4
	}, {
		"min": 22.77,
		"max": 25.3
		"min": 23.4,
		"max": 26.0
	}],
	"data": [
		[{
			"value": 5.863
			"value": 4.611
		}, {
			"value": 0.826
			"value": 0.576
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.578
			"value": 1.009
		}, {
			"value": 0.826
			"value": 0.432
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -53,19 +53,19 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.495
			"value": 0.144
		}, {
			"value": 0.661
			"value": 1.009
		}, {
			"value": 0.413
			"value": 1.153
		}, {
			"value": 0.413
			"value": 0.144
		}, {
			"value": 0.0
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -76,61 +76,61 @@
		[{
			"value": 0.0
		}, {
			"value": 0.413
			"value": 0.576
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.33
			"value": 0.0
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.495
			"value": 0.432
		}, {
			"value": 0.413
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.576
		}, {
			"value": 0.413
			"value": 0.0
		}, {
			"value": 0.0
		}, {
			"value": 0.0
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.661
			"value": 0.72
		}, {
			"value": 0.33
			"value": 0.576
		}, {
			"value": 0.413
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -139,61 +139,61 @@
		[{
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.72
		}, {
			"value": 0.495
			"value": 0.576
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.0
		}, {
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 0.33
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.288
		}, {
			"value": 0.33
			"value": 0.576
		}, {
			"value": 0.248
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.413
			"value": 0.144
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.661
			"value": 0.576
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.0
		}, {
			"value": 0.495
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -202,17 +202,17 @@
		[{
			"value": 0.0
		}, {
			"value": 0.495
			"value": 0.288
		}, {
			"value": 1.073
			"value": 0.865
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.33
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.288
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -221,19 +221,19 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.288
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -242,19 +242,19 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}, {
			"value": 0.413
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -263,19 +263,19 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.661
			"value": 0.72
		}, {
			"value": 0.578
			"value": 0.432
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.578
			"value": 0.432
		}, {
			"value": 0.083
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -284,40 +284,40 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.826
			"value": 1.009
		}, {
			"value": 0.908
			"value": 0.72
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.578
			"value": 0.576
		}, {
			"value": 0.495
			"value": 0.288
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.661
			"value": 0.288
		}, {
			"value": 0.33
			"value": 1.009
		}, {
			"value": 0.661
			"value": 0.72
		}, {
			"value": 0.743
			"value": 0.865
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.495
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -328,13 +328,13 @@
		[{
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.743
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -347,15 +347,15 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.413
			"value": 0.576
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.495
			"value": 0.432
		}, {
			"value": 0.0
		}, {
@@ -370,13 +370,13 @@
		[{
			"value": 0.0
		}, {
			"value": 0.578
			"value": 0.865
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -391,13 +391,13 @@
		[{
			"value": 0.0
		}, {
			"value": 1.156
			"value": 1.441
		}, {
			"value": 0.743
			"value": 0.576
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.0
		}, {
@@ -412,13 +412,13 @@
		[{
			"value": 0.0
		}, {
			"value": 0.495
			"value": 0.865
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -432,14 +432,14 @@
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.083
		}, {
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.432
		}, {
			"value": 0.0
		}, {
@@ -452,15 +452,15 @@
			"value": 0.0
		}],
		[{
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.0
		}, {
			"value": 0.743
			"value": 0.576
		}, {
			"value": 0.578
			"value": 0.72
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -475,13 +475,13 @@
		[{
			"value": 0.0
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.743
			"value": 0.72
		}, {
			"value": 0.578
			"value": 0.432
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.0
		}, {
@@ -496,17 +496,17 @@
		[{
			"value": 0.0
		}, {
			"value": 0.248
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 1.073
			"value": 1.297
		}, {
			"value": 0.413
			"value": 0.576
		}, {
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -517,15 +517,15 @@
		[{
			"value": 0.0
		}, {
			"value": 0.743
			"value": 0.576
		}, {
			"value": 0.826
			"value": 0.72
		}, {
			"value": 0.908
			"value": 1.441
		}, {
			"value": 0.495
			"value": 0.144
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -538,15 +538,15 @@
		[{
			"value": 0.0
		}, {
			"value": 1.239
			"value": 1.297
		}, {
			"value": 1.652
			"value": 1.729
		}, {
			"value": 0.743
			"value": 0.72
		}, {
			"value": 0.743
			"value": 0.865
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -559,15 +559,15 @@
		[{
			"value": 0.0
		}, {
			"value": 1.486
			"value": 1.009
		}, {
			"value": 1.404
			"value": 1.441
		}, {
			"value": 0.991
			"value": 1.297
		}, {
			"value": 0.743
			"value": 0.432
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -580,19 +580,19 @@
		[{
			"value": 0.0
		}, {
			"value": 0.578
			"value": 0.432
		}, {
			"value": 0.991
			"value": 1.585
		}, {
			"value": 0.661
			"value": 0.865
		}, {
			"value": 0.661
			"value": 0.0
		}, {
			"value": 0.248
			"value": 0.576
		}, {
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -601,103 +601,103 @@
		[{
			"value": 0.0
		}, {
			"value": 0.743
			"value": 0.72
		}, {
			"value": 0.578
			"value": 0.72
		}, {
			"value": 0.661
			"value": 0.865
		}, {
			"value": 1.321
			"value": 1.441
		}, {
			"value": 0.578
			"value": 0.288
		}, {
			"value": 0.0
		}, {
			"value": 0.248
			"value": 0.576
		}, {
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.0
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.578
			"value": 0.288
		}, {
			"value": 0.578
			"value": 0.576
		}, {
			"value": 0.578
			"value": 0.576
		}, {
			"value": 0.661
			"value": 0.72
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.578
			"value": 0.576
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.248
			"value": 0.0
		}, {
			"value": 0.165
			"value": 0.288
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.33
			"value": 0.432
		}, {
			"value": 0.248
			"value": 0.288
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 1.321
			"value": 1.441
		}, {
			"value": 0.743
			"value": 0.72
		}, {
			"value": 0.578
			"value": 1.441
		}, {
			"value": 0.248
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.144
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.826
			"value": 0.288
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 1.321
			"value": 1.441
		}, {
			"value": 1.899
			"value": 1.729
		}, {
			"value": 0.991
			"value": 1.297
		}, {
			"value": 1.073
			"value": 1.009
		}, {
			"value": 0.248
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.144
		}],
		[{
			"value": 0.0
		}, {
			"value": 0.661
			"value": 0.72
		}, {
			"value": 0.908
			"value": 0.576
		}, {
			"value": 0.826
			"value": 0.865
		}, {
			"value": 0.578
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.288
		}, {
			"value": 0.083
			"value": 0.144
		}, {
			"value": 0.165
			"value": 0.288
		}, {
			"value": 0.0
		}, {
@@ -706,15 +706,15 @@
		[{
			"value": 0.0
		}, {
			"value": 0.578
			"value": 0.432
		}, {
			"value": 1.156
			"value": 0.865
		}, {
			"value": 0.413
			"value": 0.432
		}, {
			"value": 0.495
			"value": 0.576
		}, {
			"value": 0.0
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -727,17 +727,17 @@
		[{
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.576
		}, {
			"value": 1.156
			"value": 1.441
		}, {
			"value": 0.743
			"value": 0.432
		}, {
			"value": 0.578
			"value": 0.144
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 0.165
			"value": 0.144
		}, {
			"value": 0.0
		}, {
@@ -748,19 +748,19 @@
		[{
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.0
		}, {
			"value": 1.404
			"value": 1.153
		}, {
			"value": 0.908
			"value": 1.297
		}, {
			"value": 0.495
			"value": 0.144
		}, {
			"value": 0.661
			"value": 0.865
		}, {
			"value": 0.165
			"value": 0.0
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {
@@ -769,17 +769,17 @@
		[{
			"value": 0.0
		}, {
			"value": 0.33
			"value": 0.288
		}, {
			"value": 0.578
			"value": 0.865
		}, {
			"value": 0.826
			"value": 1.153
		}, {
			"value": 0.578
			"value": 0.144
		}, {
			"value": 0.33
			"value": 0.144
		}, {
			"value": 0.083
			"value": 0.0
		}, {
			"value": 0.0
		}, {