Integrate Unittests from UnitTest Repository into this repository on …

…the fly (#553) * Removed unittest from makefile instead download makefile from UnitTest Repository and run the downloaded one * Renamed test folder to UnitTest Moved test files to UnitTest/tests folder. * travis.yml run two make processes and ignore deleted files in cover report
RFD-FHEM · Apr 11, 2019 · 3646f57 · 3646f57
1 parent fdc7e17
commit 3646f57
Show file tree

Hide file tree

Showing 39 changed files with 26 additions and 762 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,9 +22,9 @@ install:
  - sudo apt-get install fhem -y
  - sudo chown travis -R /opt/fhem
 script:
- - make test
+ - make test -j2
  - ./build_controls_list.sh 
  - git commit -m "Travis automatic update controls file. Build (${TRAVIS_BUILD_NUMBER}) [skip ci]" ./controls_signalduino.txt || true
  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [[ $TRAVIS_JOB_NUMBER == *.1 ]]; then git push origin HEAD:$TRAVIS_BRANCH ; fi'
  - cp -R /opt/fhem/cover_db ./
- - git --no-pager diff --name-only $TRAVIS_COMMIT_RANGE | grep .pm | xargs -I@ echo -select @ | xargs cover -report coveralls
+ - git --no-pager diff --diff-filter=d --name-only $TRAVIS_COMMIT_RANGE | grep .pm | xargs -I@ echo -select @ | xargs cover -report coveralls
diff --git a/Makefile b/Makefile
@@ -1,50 +1,23 @@
-/opt/fhem/FHEM/%.pm: FHEM/%.pm
-	sudo cp $< $@ 
-98_UnitTest.pm: test/98_unittest.pm
-	sudo cp $< /opt/fhem/FHEM/$@
-
-## deploylocal: /opt/fhem/FHEM/00_SIGNALduino.pm /opt/fhem/FHEM/10_FS10.pm /opt/fhem/FHEM/14_SD_WS.pm 98_UnitTest.pm /opt/fhem/FHEM/90_SIGNALduino_un.pm /opt/fhem/FHEM/lib/signalduino_protocols.hash
-deploylocal : 98_UnitTest.pm
-	sudo cp FHEM/*.pm /opt/fhem/FHEM/
-	sudo cp FHEM/lib/*.pm /opt/fhem/FHEM/lib
-	sudo cp test/*.json /opt/fhem/FHEM/lib
-	sudo cp test/*.pm /opt/fhem/FHEM/lib
-	sudo timeout 3 killall -qws2 perl || sudo killall -qws9 perl || true
-	sudo rm /opt/fhem/log/fhem-*.log || true
-	sudo cp test/fhem.cfg /opt/fhem/fhem.cfg
-	sudo rm /opt/fhem/log/fhem.save || true
-	TZ=Europe/Berlin 
-	cd /opt/fhem && perl -MDevel::Cover fhem.pl fhem.cfg && cd ${TRAVIS_BUILD_DIR}
+.PHONY: test UnitTest/makefile deploylocalLibs clean
+space:=
+space+=
+
+MAKEFILE_DIR:=$(subst $(space),\$(space),$(shell dirname $(subst $(space),\$(space),$(realpath $(lastword $(MAKEFILE_LIST))))))
+
+deploylocalLibs:
+	@cp $(MAKEFILE_DIR)/UnitTest/FHEM/lib/*.pm /opt/fhem/FHEM/lib
+	@cp $(MAKEFILE_DIR)/UnitTest/FHEM/lib/*.json /opt/fhem/FHEM/lib
+	@cp $(MAKEFILE_DIR)/FHEM/lib/*.pm /opt/fhem/FHEM/lib
+
 
-test: deploylocal
-	@echo === running commandref test ===
-	git --no-pager diff --name-only ${TRAVIS_COMMIT_RANGE} | egrep "\.pm" | xargs -I@ echo -select @ | xargs --no-run-if-empty perl /opt/fhem/contrib/commandref_join.pl 
-	@echo === running unit tests ===
-	test/test-runner.sh test_modules
-	test/test-runner.sh test_SD_Protocols
-	test/test-runner.sh test_defineDefaults
-	test/test-runner.sh test_callsub_1
-	test/test-runner.sh test1
-	test/test-runner.sh test3
-	test/test-runner.sh test4
-	test/test-runner.sh test_mu_1
-	test/test-runner.sh test_MS_2
-	test/test-runner.sh test_loadprotohash
-	test/test-runner.sh test_developid_1
-	test/test-runner.sh test_proto44
-	test/test-runner.sh test_proto46
-	test/test-runner.sh test_proto57
-	test/test-runner.sh test_proto84
-	test/test-runner.sh test_proto85
-	test/test-runner.sh test_fingerprint
-	test/test-runner.sh test_firmware_download_1
-	test/test-runner.sh test_modulematch_1
-	test/test-runner.sh test_sub_SIGNALduino_OSV2
-	test/test-runner.sh test_sub_MCTFA
-	test/test-runner.sh test_sub_SIGNALduino_getAttrDevelopment
-	test/test-runner.sh test_set_sendMsg
-	test/test-runner.sh test_read
-	test/test-runner.sh test_SDWS07
-	test/test-runner.sh test_SDWS
-	@echo === finished unit tests ===
-	sudo timeout 30 killall -vw perl || sudo killall -vws9 perl
+UnitTest/makefile: 
+	@mkdir -p $(dir $@)
+	@test -f $@ || wget -O $@ https://raw.githubusercontent.com/RFD-FHEM/UnitTest/master/makefile
+
+test: UnitTest/makefile deploylocalLibs
+	${MAKE} -f $< setupEnv test PERL_OPTS="-MDevel::Cover"
+
+clean:  UnitTest/makefile	
+	${MAKE} -f $< clean
+	@rm UnitTest/makefile || true
+
diff --git a/test/test_firmware_releases.json → ...Test/FHEM/lib/test_firmware_releases.json b/test/test_firmware_releases.json → ...Test/FHEM/lib/test_firmware_releases.json
diff --git a/test/test_loadprotohash-nok.pm → UnitTest/FHEM/lib/test_loadprotohash-nok.pm b/test/test_loadprotohash-nok.pm → UnitTest/FHEM/lib/test_loadprotohash-nok.pm
diff --git a/test/test_loadprotohash-ok.pm → UnitTest/FHEM/lib/test_loadprotohash-ok.pm b/test/test_loadprotohash-ok.pm → UnitTest/FHEM/lib/test_loadprotohash-ok.pm
diff --git a/test/fhem.cfg → UnitTest/fhem_ut.cfg b/test/fhem.cfg → UnitTest/fhem_ut.cfg
diff --git a/test/install.md → UnitTest/install.md b/test/install.md → UnitTest/install.md
diff --git a/test/test1-definition.txt → UnitTest/tests/test1-definition.txt b/test/test1-definition.txt → UnitTest/tests/test1-definition.txt
diff --git a/test/test3-definition.txt → UnitTest/tests/test3-definition.txt b/test/test3-definition.txt → UnitTest/tests/test3-definition.txt
diff --git a/test/test4-definition.txt → UnitTest/tests/test4-definition.txt b/test/test4-definition.txt → UnitTest/tests/test4-definition.txt
diff --git a/test/test_MS_2-definition.txt → UnitTest/tests/test_MS_2-definition.txt b/test/test_MS_2-definition.txt → UnitTest/tests/test_MS_2-definition.txt
diff --git a/test/test_SDWS-definition.txt → UnitTest/tests/test_SDWS-definition.txt b/test/test_SDWS-definition.txt → UnitTest/tests/test_SDWS-definition.txt
diff --git a/test/test_SDWS07-definition.txt → UnitTest/tests/test_SDWS07-definition.txt b/test/test_SDWS07-definition.txt → UnitTest/tests/test_SDWS07-definition.txt
diff --git a/test/test_SD_Protocols-definition.txt → ...st/tests/test_SD_Protocols-definition.txt b/test/test_SD_Protocols-definition.txt → ...st/tests/test_SD_Protocols-definition.txt
diff --git a/test/test_callsub_1-definition.txt → UnitTest/tests/test_callsub_1-definition.txt b/test/test_callsub_1-definition.txt → UnitTest/tests/test_callsub_1-definition.txt
diff --git a/test/test_defineDefaults-definition.txt → .../tests/test_defineDefaults-definition.txt b/test/test_defineDefaults-definition.txt → .../tests/test_defineDefaults-definition.txt
diff --git a/test/test_developid_1-definition.txt → ...est/tests/test_developid_1-definition.txt b/test/test_developid_1-definition.txt → ...est/tests/test_developid_1-definition.txt
diff --git a/test/test_fingerprint-definition.txt → ...est/tests/test_fingerprint-definition.txt b/test/test_fingerprint-definition.txt → ...est/tests/test_fingerprint-definition.txt
diff --git a/test/test_firmware_download_1-definition.txt → ...s/test_firmware_download_1-definition.txt b/test/test_firmware_download_1-definition.txt → ...s/test_firmware_download_1-definition.txt
diff --git a/test/test_loadprotohash-definition.txt → ...t/tests/test_loadprotohash-definition.txt b/test/test_loadprotohash-definition.txt → ...t/tests/test_loadprotohash-definition.txt
diff --git a/test/test_modulematch_1-definition.txt → ...t/tests/test_modulematch_1-definition.txt b/test/test_modulematch_1-definition.txt → ...t/tests/test_modulematch_1-definition.txt
diff --git a/test/test_modules-definition.txt → UnitTest/tests/test_modules-definition.txt b/test/test_modules-definition.txt → UnitTest/tests/test_modules-definition.txt
diff --git a/test/test_mu_1-definition.txt → UnitTest/tests/test_mu_1-definition.txt b/test/test_mu_1-definition.txt → UnitTest/tests/test_mu_1-definition.txt
diff --git a/test/test_proto44-definition.txt → UnitTest/tests/test_proto44-definition.txt b/test/test_proto44-definition.txt → UnitTest/tests/test_proto44-definition.txt
diff --git a/test/test_proto46-definition.txt → UnitTest/tests/test_proto46-definition.txt b/test/test_proto46-definition.txt → UnitTest/tests/test_proto46-definition.txt
@@ -8,4 +8,5 @@ defmod test_proto46 UnitTest dummyDuino (
  is( ($SD_Dispatch->called_with)[4], "46", "SIGNALduno_Dispatch check id" );
  is( ($SD_Dispatch->called_with)[2], "P46#BAFB0", "SIGNALduno_Dispatch check dmsg" );
 } 
-)
+)
+
diff --git a/test/test_proto57-definition.txt → UnitTest/tests/test_proto57-definition.txt b/test/test_proto57-definition.txt → UnitTest/tests/test_proto57-definition.txt
diff --git a/test/test_proto84-definition.txt → UnitTest/tests/test_proto84-definition.txt b/test/test_proto84-definition.txt → UnitTest/tests/test_proto84-definition.txt
diff --git a/test/test_proto85-definition.txt → UnitTest/tests/test_proto85-definition.txt b/test/test_proto85-definition.txt → UnitTest/tests/test_proto85-definition.txt
diff --git a/test/test_read-definition.txt → UnitTest/tests/test_read-definition.txt b/test/test_read-definition.txt → UnitTest/tests/test_read-definition.txt
diff --git a/test/test_set_sendMsg-definition.txt → ...est/tests/test_set_sendMsg-definition.txt b/test/test_set_sendMsg-definition.txt → ...est/tests/test_set_sendMsg-definition.txt
diff --git a/test/test_sub_MCTFA-definition.txt → UnitTest/tests/test_sub_MCTFA-definition.txt b/test/test_sub_MCTFA-definition.txt → UnitTest/tests/test_sub_MCTFA-definition.txt
diff --git a/.../test_sub_SIGNALduino_OSV2-definition.txt → .../test_sub_SIGNALduino_OSV2-definition.txt b/.../test_sub_SIGNALduino_OSV2-definition.txt → .../test_sub_SIGNALduino_OSV2-definition.txt
diff --git a/...ALduino_getAttrDevelopment-definition.txt → ...ALduino_getAttrDevelopment-definition.txt b/...ALduino_getAttrDevelopment-definition.txt → ...ALduino_getAttrDevelopment-definition.txt
diff --git a/test/00-list-dummyduino-cmd.txt b/test/00-list-dummyduino-cmd.txt
diff --git a/test/00-list-dummyduino-excl.txt b/test/00-list-dummyduino-excl.txt
diff --git a/test/00-list-dummyduino-res.txt b/test/00-list-dummyduino-res.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,5 @@ defmod test_proto46 UnitTest dummyDuino ( @@
      is( ($SD_Dispatch->called_with)[4], "46", "SIGNALduno_Dispatch check id" );
      is( ($SD_Dispatch->called_with)[2], "P46#BAFB0", "SIGNALduno_Dispatch check dmsg" );
     }
-    )
+    )