From 31fbd06912fdaa1d4df7c890d2a7cde89009abfd Mon Sep 17 00:00:00 2001 From: Chris Cody Date: Thu, 4 Sep 2014 09:15:07 -0500 Subject: [PATCH] Omaha #3365 Realign AWIPS2_baseline tests Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f Former-commit-id: c1468c97fbb503e5fc3104969237434e779305df [formerly 93973561284485c14dfe6c936c1652727b4d8107] [formerly 98b767f5732aae4317cfad3550c535c4b447a28e] [formerly 1f9c825de5b9388efc59729c58b906ea08eef8d3 [formerly 98b767f5732aae4317cfad3550c535c4b447a28e [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]] Former-commit-id: 1f9c825de5b9388efc59729c58b906ea08eef8d3 Former-commit-id: 62a7ea8c47bc0ed51d1ffff50aaf9436e4370625 [formerly 0d677d1aca872f249255611e3be0861ad097fac0] Former-commit-id: c6b1ff4e90be0776529abe18f92bfb81f33185c6 --- tests/.classpath | 1 - .../plugin/gfe/watch/TestWCLWatchSrv.java | 2 - .../props/EnvAttributePropertyInjector.java | 55 ------------------- .../time/TimeToolsAllowArchiveTest.java | 2 +- .../time/TimeToolsNoArchiveTest.java | 2 +- 5 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 tests/unit/com/raytheon/uf/edex/core/props/EnvAttributePropertyInjector.java diff --git a/tests/.classpath b/tests/.classpath index c3ad8c3801..6b5f0b27ef 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -14,7 +14,6 @@ - diff --git a/tests/unit/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java b/tests/unit/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java index 1b7da6d1f9..7c39e3b871 100644 --- a/tests/unit/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java +++ b/tests/unit/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java @@ -118,7 +118,6 @@ public class TestWCLWatchSrv { return rtnSet; } - @Override protected File getWclDir(String siteID) { String home = System.getenv("HOME"); File fakeDir = new File(home); @@ -148,7 +147,6 @@ public class TestWCLWatchSrv { // the permanent file. Use an anonymous subclass to bypass CAVE // localization. wclWatchSrv = new WCLWatchSrv() { - @Override protected File getWclDir(String siteID) { String home = System.getenv("HOME"); return new File(home); diff --git a/tests/unit/com/raytheon/uf/edex/core/props/EnvAttributePropertyInjector.java b/tests/unit/com/raytheon/uf/edex/core/props/EnvAttributePropertyInjector.java deleted file mode 100644 index 4e18340b93..0000000000 --- a/tests/unit/com/raytheon/uf/edex/core/props/EnvAttributePropertyInjector.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.edex.core.props; - -import org.apache.commons.configuration.Configuration; - -/** - * Inject attribute names, attribute values, and property values into the - * PropertiesFactory environment configuration. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Sep 06, 2013 2344       bgonzale    Initial creation
- * 
- *
- * - * @author bgonzale - * @version 1.0 - */ -public class EnvAttributePropertyInjector { - - public static void injectAttributeProperty(String attributeName, - String attributeValue, String propertyValue) { - /* TODO HERE FIX PropertiesFactory reference - Configuration attrNamesConfig = PropertiesFactory.getInstance() - .getEnvProperties().theAttrNamesConfiguration; - Configuration envConfig = PropertiesFactory.getInstance() - .getEnvProperties().theEnvConfiguration; - - attrNamesConfig.setProperty(attributeName, attributeValue); - envConfig.setProperty(attributeValue, propertyValue); - */ - } -} diff --git a/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsAllowArchiveTest.java b/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsAllowArchiveTest.java index 5dea281acc..9fab0fd709 100644 --- a/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsAllowArchiveTest.java +++ b/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsAllowArchiveTest.java @@ -77,7 +77,7 @@ public class TimeToolsAllowArchiveTest { @Override public Calendar getCalendar() { final Calendar c = Calendar.getInstance(); - c.setTimeZone(TimeZone.getTimeZone(TimeTools.ZULU_TIMEZONE)); + c.setTimeZone(TimeZone.getTimeZone("GMT")); c.set(Calendar.YEAR, 2011); c.set(Calendar.MONTH, Calendar.JULY); c.set(Calendar.DAY_OF_MONTH, 15); diff --git a/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsNoArchiveTest.java b/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsNoArchiveTest.java index 0a1cfce06a..a6f5c859a4 100644 --- a/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsNoArchiveTest.java +++ b/tests/unit/com/raytheon/uf/edex/decodertools/time/TimeToolsNoArchiveTest.java @@ -117,7 +117,7 @@ public class TimeToolsNoArchiveTest { @Override public Calendar getCalendar() { final Calendar c = Calendar.getInstance(); - c.setTimeZone(TimeZone.getTimeZone(TimeTools.ZULU_TIMEZONE)); + c.setTimeZone(TimeZone.getTimeZone("GMT")); c.set(Calendar.YEAR, 2011); c.set(Calendar.MONTH, Calendar.JULY); c.set(Calendar.DAY_OF_MONTH, 31);