Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61 Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9 |
||
---|---|---|
.. | ||
conf/res | ||
data | ||
deploy | ||
integration/com/raytheon/uf/edex | ||
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.