Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5 Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29 |
||
---|---|---|
.. | ||
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.