Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14) Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3 |
||
---|---|---|
.. | ||
conf/res | ||
data | ||
deploy | ||
integration/com/raytheon/uf | ||
lib | ||
manual/com/raytheon | ||
python/gfe | ||
resources | ||
unit | ||
utility | ||
.classpath | ||
.gitignore | ||
.project | ||
.pydevproject | ||
build.properties | ||
build.xml | ||
developer-build.properties | ||
jenkins-build.properties | ||
README | ||
runTests.sh | ||
tests.ecl |
Notes on running tests: 1. The order on the classpath of Hamcrest, Mockito, and JUnit is very important to getting the tests to run correctly. There are different versions of Hamcrest classes in each.