unit test for gethistory

Author: larrydiamond

build.gradle

@@ -36,9 +36,10 @@ dependencies {
 	implementation group: 'org.knowm.xchart', name: 'xchart', version: '3.8.5'
 	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
 	implementation group: 'com.github.librepdf', name: 'openpdf', version: '1.3.30'
-
 	implementation("com.google.guava:guava:32.1.2-jre")
+
 	testImplementation 'com.tngtech.archunit:archunit-junit5:1.1.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0'
 }
 
 tasks.named('test') {

src/main/java/com/ldiamond/sqgraph/SqgraphApplication.java

@@ -159,13 +159,14 @@ public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
 		return null;
 	}
 
-	private static AssembledSearchHistory getHistory (final Config config, final String sdfsqString, final String key, final String metrics, final HttpHeaders headers, RestTemplate restTemplate) {
+	public static AssembledSearchHistory getHistory (final Config config, final String sdfsqString, final String key, final String metrics, 
+	final HttpHeaders headers, RestTemplate restTemplate) {
 		AssembledSearchHistory assembledSearchHistory = new AssembledSearchHistory();
 		int page = 1;
 		boolean notYetLastPage = true;
 		do {
 			final String uri = config.getUrl() + "/api/measures/search_history?from="+sdfsqString+"&p="+page+"&ps=999&component=" + key + "&metrics=" + metrics;
-//			System.out.println (uri);
+			System.out.println (uri);
 			ResponseEntity<SearchHistory> response = restTemplate.exchange(uri, HttpMethod.GET, new HttpEntity<String>(headers), SearchHistory.class);
 			SearchHistory result = response.getBody();
 			if (result != null) {

src/test/java/com/ldiamond/sqgraph/ArchitectureUnitTests.java

@@ -10,13 +10,19 @@
 public class ArchitectureUnitTests {
 
     @ArchTest
-    static final ArchRule no_vectors = noClasses().should().callConstructor(java.util.Vector.class);
+    static final ArchRule no_vectors = noClasses().should().callConstructor(java.util.Vector.class).because("Use ArrayList");
 
     @ArchTest
-    static final ArchRule no_hashtable = noClasses().should().callConstructor(java.util.Hashtable.class);
+    static final ArchRule no_hashtable = noClasses().should().callConstructor(java.util.Hashtable.class).because("Use HashSet");
 
     @ArchTest
-    static final ArchRule no_stringbuffer = noClasses().should().callConstructor(java.lang.StringBuffer.class);
+    static final ArchRule no_stringbuffer = noClasses().should().callConstructor(java.lang.StringBuffer.class).because("Use StringBuilder");
+    
+    @ArchTest
+    static final ArchRule no_treeset = noClasses().should().callConstructor(java.util.TreeSet.class).because("Use ConcurrentSkipListSet");
+
+    @ArchTest
+    static final ArchRule no_treemap = noClasses().should().callConstructor(java.util.TreeMap.class).because("Use ConcurrentSkipListMap");
 
     @ArchTest
     private final ArchRule no_jodatime = NO_CLASSES_SHOULD_USE_JODATIME;

src/test/java/com/ldiamond/sqgraph/SqgraphApplicationTests.java

@@ -3,14 +3,28 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+@ExtendWith(MockitoExtension.class)     
 class SqgraphApplicationTests {
 
 	@Test
@@ -231,4 +245,51 @@ void populateMetricsHasSyntheticPerH() {
 		assertEquals(synths.get("something__PER_H_otherthing").getRealMetrics().get(1), "otherthing");
 		assertEquals(200.0, synths.get("something__PER_H_otherthing").calculate(metrics), 0);
 	}
+
+	@Mock
+	RestTemplate restTemplate;
+
+	@Test
+	void getHistory() {
+		final Config config = new Config();
+		config.setUrl("prefix");
+
+		SearchHistory sh = new SearchHistory();
+		Paging paging = new Paging();
+		paging.setTotal(2);
+		Measures[] measuresArray = new Measures[2];
+		sh.setMeasures(measuresArray);
+		measuresArray [0] = new Measures();
+		measuresArray [0].setMetric("first");
+		measuresArray [0].setHistory(new History[1]);
+		measuresArray [0].history[0] = new History();
+		measuresArray [0].history[0].setDate(new Date("Tue, 1 Aug 1995 13:30:00 GMT"));
+		measuresArray [0].history[0].setValue(1.0);
+		
+		measuresArray [1] = new Measures();
+		measuresArray [1].setMetric("second");
+		measuresArray [1].setHistory(new History[1]);
+		measuresArray [1].history[0] = new History();
+		measuresArray [1].history[0].setDate(new Date("Wed, 2 Aug 1995 13:30:00 GMT"));
+		measuresArray [1].history[0].setValue(2.0);
+		
+		sh.setPaging(paging);
+
+		ResponseEntity<SearchHistory> rsh = new ResponseEntity<>(sh, null, HttpStatus.OK);
+		HttpHeaders httpHeaders = new HttpHeaders();
+		HttpEntity<String> hes = new HttpEntity<>(httpHeaders);
+		when (restTemplate.exchange("prefix/api/measures/search_history?from=blah&p=1&ps=999&component=blah&metrics=blah",HttpMethod.GET,hes,SearchHistory.class)).thenReturn(rsh);
+		when (restTemplate.exchange("prefix/api/measures/search_history?from=blah&p=2&ps=999&component=blah&metrics=blah",HttpMethod.GET,hes,SearchHistory.class)).thenReturn(rsh);
+		AssembledSearchHistory ash = SqgraphApplication.getHistory(config, "blah", "blah", "blah", httpHeaders, restTemplate);
+
+		assertEquals(4, ash.getMeasures().size());
+		assertEquals("first", ash.getMeasures().get(0).getMetric());
+		assertEquals("second", ash.getMeasures().get(1).getMetric());
+		assertEquals("first", ash.getMeasures().get(2).getMetric());
+		assertEquals("second", ash.getMeasures().get(3).getMetric());
+		assertEquals(1, ash.getMeasures().get(0).history.length);
+		assertEquals(1, ash.getMeasures().get(1).history.length);
+		assertEquals(1, ash.getMeasures().get(2).history.length);
+		assertEquals(1, ash.getMeasures().get(3).history.length);
+	}
 }