Merge pull request #612 from OpenEVSE/divert_sim_test

Divert_sim testing

Author: KipK

.github/workflows/divert_sim.yaml

@@ -67,3 +67,22 @@ jobs:
         run: |
           cd OpenEVSE_WiFi/divert_sim
           make -j
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: divert_sim
+          path: OpenEVSE_WiFi/divert_sim/divert_sim
+      
+      - name: run tests
+        run: |
+          cd OpenEVSE_WiFi/divert_sim
+          bash runall.sh
+
+      - name : Upload test results
+        uses: actions/upload-artifact@v3
+        with:
+          name: test_results
+          path: |
+            OpenEVSE_WiFi/divert_sim/output
+            OpenEVSE_WiFi/divert_sim/view.html

divert_sim/Makefile

@@ -131,6 +131,9 @@ all: $(TARGETS)
 clean:
 	rm -f $(TARGETS) $(OBJ)
 
+server:
+	python3 -m http.server
+
 $(OBJ): %.o : %.cpp $(DEPS)
 	$(CPP) -c -o $@ $< $(CPPFLAGS)
 

divert_sim/divert_sim.cpp

@@ -62,7 +62,7 @@ time_t parse_date(const char *dateStr)
     }
   }
 
-  tm time;
+  tm time = {0};
   time.tm_year = y - 1900; // Year since 1900
   time.tm_mon = M - 1;     // 0-11
   time.tm_mday = d;        // 1-31

divert_sim/runall.sh

@@ -1,16 +1,37 @@
 #!/bin/bash
 
+PASS=0
+FAIL=0
+
+function test
+{
+  file=$1
+  shift
+  echo "Testing $file"
+  ./divert_sim $@ < data/$file.csv > output/$file.csv
+  diff --side-by-side --suppress-common-lines snapshot/$file.csv output/$file.csv
+  if [ $? -eq 0 ]; then
+    echo "Test $file passed"
+    ((PASS+=1))
+  else
+    echo "Test $file failed"
+    ((FAIL+=1))
+  fi
+}
+
 mkdir -p output
 
-./divert_sim < data/almostperfect.csv > output/almostperfect.csv
-./divert_sim < data/CloudyMorning.csv > output/CloudyMorning.csv
-./divert_sim < data/day1.csv > output/day1.csv
-./divert_sim < data/day2.csv > output/day2.csv
-./divert_sim < data/day3.csv > output/day3.csv
-./divert_sim -g 2 < data/day1_grid_ie.csv > output/day1_grid_ie.csv
-./divert_sim -g 2 < data/day2_grid_ie.csv > output/day2_grid_ie.csv
-./divert_sim -g 2 < data/day3_grid_ie.csv > output/day3_grid_ie.csv
-./divert_sim -v 2 < data/solar-vrms.csv > output/solar-vrms.csv
-./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-03-22.csv > output/Energy_and_Power_Day_2020-03-22.csv
-./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-03-31.csv > output/Energy_and_Power_Day_2020-03-31.csv
-./divert_sim --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}' < data/Energy_and_Power_Day_2020-04-01.csv > output/Energy_and_Power_Day_2020-04-01.csv
+test almostperfect
+test CloudyMorning
+test day1
+test day2
+test day3
+test day1_grid_ie -g 2
+test day2_grid_ie -g 2
+test day3_grid_ie -g 2
+test solar-vrms -v 2
+test Energy_and_Power_Day_2020-03-22 --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}'
+test Energy_and_Power_Day_2020-03-31 --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}'
+test Energy_and_Power_Day_2020-04-01 --sep \; --kw --config '{"divert_decay_smoothing_factor":0.4}'
+echo Passed $PASS tests, failed $FAIL tests
+exit $FAIL