Conflicts: cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java tests/.classpath tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java Former-commit-id: |
||
---|---|---|
.. | ||
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.