Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts: tests/.classpath Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c Former-commit-id:bbf1fd8aa8[formerly91fde6ab60] [formerlyf8faec0526] [formerly529377618f[formerlyf8faec0526[formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]] Former-commit-id:529377618fFormer-commit-id: 6cf763b4bcebd242e12b9f707dca3961b380f686 [formerly3fc1103d07] Former-commit-id:8e340e4b05
This commit is contained in:
Chris Cody
Richard Peter
parent
aef95b0ef6
commit
3600dd6c14
16 changed files with 207 additions and 523 deletions
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.edex.plugin.gfe"/>
|
||||
<classpathentry excluding="*HILOTest.java*|com/raytheon/viz/gfe/core/parm/TestParm.java|com/raytheon/viz/gfe/core/parm/TestParmManager.java|com/raytheon/viz/gfe/ui/runtimeui/TestHazardUtils.java|gov/noaa/nws/ncep/gempak/parameters/colorbar/CLRBARTest.java|gov/noaa/nws/ncep/gempak/parameters/line/LineDataStringParserTest.java" kind="src" path="unit"/>
|
||||
<classpathentry kind="src" path="deploy"/>
|
||||
<classpathentry kind="src" path="resources"/>
|
||||
|
|
@ -12,16 +13,11 @@
|
|||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.util"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.comm"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.http"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.registry"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.viz.datadelivery"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.serialization"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.registry.schemas.ebxml"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.datadelivery.harvester"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.localization"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.edex.common"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.log4j"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.datadelivery.bandwidth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.datadelivery.retrieval"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.commons.lang"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.geotools"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.dataplugin"/>
|
||||
|
|
@ -30,7 +26,6 @@
|
|||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.springframework"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.serialization.comm"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/edu.uci.ics.crawler4j"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.retrieval"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/net.dods"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.google.guava"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.time"/>
|
||||
|
|
@ -52,22 +47,17 @@
|
|||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.commons.io"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datastorage"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.event"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.event"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.event"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.measure"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.vecmath"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/h2-1.3.171.jar"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.gridcoverage"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.datadelivery.service"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.viz.ui"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.bandwidth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.registry.event"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.request"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.viz.plugin.nwsauth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.plugin.nwsauth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.datadelivery.service"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.units"/>
|
||||
<classpathentry exported="true" kind="src" path="/com.raytheon.uf.viz.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.dom4j"/>
|
||||
|
|
@ -87,14 +77,11 @@
|
|||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="lib/javax.servlet_2.5.0.v200910301333.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.datadelivery.harvester"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/javax.jms"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/org.apache.commons.cxf"/>
|
||||
<classpathentry kind="src" path="/com.raytheon.uf.common.archive"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.edex.datadelivery.bandwidth.ncf"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/org.apache.thrift"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.dataplugin.gfe"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.gfe"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.python"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.message"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/gov.noaa.nws.ncep.common.dataplugin.ffg"/>
|
||||
|
|
@ -148,7 +135,6 @@
|
|||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.wxmath"/>
|
||||
<classpathentry kind="lib" path="lib/org.eclipse.jface_3.8.0.v20120912-135020.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/org.apache.commons.configuration"/>
|
||||
<classpathentry kind="src" path="/com.raytheon.uf.edex.datadelivery.retrieval.wfs"/>
|
||||
<classpathentry kind="lib" path="lib/javax.servlet.source_2.5.0.v200910301333.jar"/>
|
||||
<classpathentry kind="lib" path="lib/javax.servlet.jsp-2.1.0.v201105211820.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jetty-http-7.6.14.v20131031.jar"/>
|
||||
|
|
@ -165,5 +151,9 @@
|
|||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.jms"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.registry.schemas.iso19115"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.edex.requestsrv"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.convert"/>
|
||||
<classpathentry kind="src" path="/com.raytheon.edex.plugin.shef"/>
|
||||
<classpathentry kind="src" path="/com.raytheon.uf.common.dataplugin.obs"/>
|
||||
<classpathentry kind="src" path="/com.raytheon.uf.edex.plugin.taf"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseType;
|
|||
|
||||
import org.junit.Ignore;
|
||||
|
||||
import com.raytheon.uf.common.registry.EbxmlNamespaces;
|
||||
import com.raytheon.uf.common.registry.schemas.ebxml.util.EbxmlNamespaces;
|
||||
|
||||
/**
|
||||
* A plugin subscribed listener.
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ import org.w3c.dom.Node;
|
|||
import org.w3c.dom.NodeList;
|
||||
|
||||
import com.raytheon.uf.common.event.EventBusTest;
|
||||
import com.raytheon.uf.common.registry.EbxmlNamespaces;
|
||||
import com.raytheon.uf.common.registry.schemas.ebxml.util.EbxmlNamespaces;
|
||||
import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes;
|
||||
import com.raytheon.uf.common.registry.constants.DeliveryMethodTypes;
|
||||
import com.raytheon.uf.common.registry.constants.NotificationOptionTypes;
|
||||
|
|
|
|||
|
|
@ -46,17 +46,17 @@ import org.w3c.dom.Document;
|
|||
import org.w3c.dom.Node;
|
||||
import org.w3c.dom.NodeList;
|
||||
|
||||
import com.raytheon.uf.common.registry.EbxmlNamespaces;
|
||||
import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes;
|
||||
import com.raytheon.uf.common.registry.constants.DeliveryMethodTypes;
|
||||
import com.raytheon.uf.common.registry.constants.NotificationOptionTypes;
|
||||
import com.raytheon.uf.common.registry.constants.RegistryObjectTypes;
|
||||
import com.raytheon.uf.common.registry.constants.StatusTypes;
|
||||
import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
|
||||
import com.raytheon.uf.common.registry.services.RegistrySOAPServices;
|
||||
import com.raytheon.uf.common.registry.schemas.ebxml.util.EbxmlNamespaces;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.query.plugins.GetNotification;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.query.types.QueryTest;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices;
|
||||
import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
|
||||
|
||||
/**
|
||||
|
|
@ -70,6 +70,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* 10/8/2013 1682 bphillip Initial implementation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* </pre>
|
||||
*
|
||||
* @author bphillip
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import junit.framework.Assert;
|
|||
|
||||
import org.junit.Test;
|
||||
import org.opengis.metadata.spatial.PixelOrientation;
|
||||
import org.opengis.referencing.FactoryException;
|
||||
import org.opengis.referencing.operation.TransformException;
|
||||
|
||||
import com.raytheon.uf.common.dataplugin.gfe.config.ProjectionData;
|
||||
import com.raytheon.uf.common.dataplugin.gfe.config.ProjectionData.ProjectionType;
|
||||
|
|
@ -199,8 +201,9 @@ public class ProjectionDataTest {
|
|||
for (Coordinate[] coords : testCase.testInOut) {
|
||||
Coordinate gridCoord = coords[0];
|
||||
Coordinate expected = coords[1];
|
||||
try {
|
||||
Coordinate latLon = testCase.proj.gridCoordinateToLatLon(
|
||||
gridCoord, orientation);
|
||||
gridCoord);
|
||||
System.out.println(gridCoord + " " + latLon);
|
||||
Assert.assertTrue("expected: " + expected.x + ", got: "
|
||||
+ latLon.x,
|
||||
|
|
@ -209,6 +212,13 @@ public class ProjectionDataTest {
|
|||
+ latLon.y,
|
||||
withinTolerance(latLon.y, expected.y, TOLERANCE));
|
||||
}
|
||||
catch(TransformException te) {
|
||||
te.printStackTrace();
|
||||
}
|
||||
catch(FactoryException fe) {
|
||||
fe.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
|
||||
* further licensing information.
|
||||
**/
|
||||
package com.raytheon.edex.plugin.gfe.watch;
|
||||
package com.raytheon.edex.plugin.gfe.wcl;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
|
|
@ -45,6 +45,27 @@ import com.raytheon.edex.plugin.gfe.watch.WCLWatchSrv;
|
|||
import com.raytheon.edex.plugin.gfe.watch.WatchProductUtil;
|
||||
import com.raytheon.edex.plugin.gfe.watch.WclInfo;
|
||||
|
||||
/**
|
||||
* WCLWatchSrv test
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Initial creation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* WCLWatchSrv API Has changed since this test was created.
|
||||
* Test functionality that is no longer supported by the API (i.e. will not compile)
|
||||
* has been "deactivated" (commented out).
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author bclement
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
public class TestWCLWatchSrv {
|
||||
|
||||
private WclInfo wclInfoA;
|
||||
|
|
@ -136,12 +157,16 @@ public class TestWCLWatchSrv {
|
|||
return new File(home);
|
||||
}
|
||||
};
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
try {
|
||||
temp = File.createTempFile("xxx", null, null);
|
||||
PrintWriter pw = new PrintWriter(temp);
|
||||
pw.println("Testing");
|
||||
pw.close();
|
||||
Collection<String> dummy = Collections.emptySet();
|
||||
|
||||
wclWatchSrv.makePermanent(temp, completePIL, dummy);
|
||||
assertTrue("expetedFile exists", expectedFile.exists());
|
||||
assertTrue("expectedFile isFile", expectedFile.isFile());
|
||||
|
|
@ -155,10 +180,16 @@ public class TestWCLWatchSrv {
|
|||
expectedFile.delete();
|
||||
}
|
||||
}
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateTempWclFile() throws Exception {
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
File wclFile = wclWatchSrv
|
||||
.createTempWclFile("captain=\"Rafe\"\nfirst_officer='Buttercup'\n");
|
||||
assertNotNull("wclFile", wclFile);
|
||||
|
|
@ -172,6 +203,9 @@ public class TestWCLWatchSrv {
|
|||
} finally {
|
||||
wclFile.delete();
|
||||
}
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -183,6 +217,10 @@ public class TestWCLWatchSrv {
|
|||
Date expireTime = new Date(12345678999L);
|
||||
Date issueTime = new Date(35791113001L);
|
||||
String watchType = "SV.A";
|
||||
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
String result = wclWatchSrv.makeWclStr(finalUGCList, expireTime,
|
||||
issueTime, watchType);
|
||||
String expectedResult = "watchtype = \"SV.A\"\n"
|
||||
|
|
@ -214,16 +252,25 @@ public class TestWCLWatchSrv {
|
|||
expectedResult = "watchtype = \"SV.A\"\n" + "finalUGCList = []\n"
|
||||
+ "expTime =12345678\n" + "issueTime =35791113\n";
|
||||
assertEquals("result-empty UGC list", expectedResult, result);
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetWatchType() {
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
String watchType;
|
||||
watchType = wclWatchSrv.getWatchType(wclInfoA);
|
||||
assertEquals("watch A type", "TO.A", watchType);
|
||||
|
||||
watchType = wclWatchSrv.getWatchType(wclInfoB);
|
||||
assertEquals("watch B type", "SV.A", watchType);
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -236,6 +283,9 @@ public class TestWCLWatchSrv {
|
|||
return new Date();
|
||||
}
|
||||
};
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
result = wclWatchSrv.getExpireTime(wclInfoA);
|
||||
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
|
||||
cal.set(Calendar.DAY_OF_MONTH, 2);
|
||||
|
|
@ -248,11 +298,17 @@ public class TestWCLWatchSrv {
|
|||
|
||||
result = wclWatchSrv.getExpireTime(wclInfoB);
|
||||
assertNull("getExpireTime B", result);
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetUGCs() {
|
||||
List<String> UGCs;
|
||||
/* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
UGCs = wclWatchSrv.getUGCs(wclInfoA);
|
||||
List<String> expectedUGCs = new ArrayList<String>();
|
||||
expectedUGCs.add("NEB002");
|
||||
|
|
@ -267,5 +323,8 @@ public class TestWCLWatchSrv {
|
|||
UGCs = wclWatchSrv.getUGCs(wclInfoB);
|
||||
expectedUGCs.clear();
|
||||
assertEquals("UGCs B", expectedUGCs, UGCs);
|
||||
* 08-26-2014 Issue 3365 WclWatchSrv API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ import java.util.Iterator;
|
|||
import org.junit.Test;
|
||||
|
||||
import com.raytheon.edex.transform.shef.MetarToShefTransformer;
|
||||
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
|
||||
/* 08-26-2014 Issue 3365 IDecoderGettable class no longer exists.
|
||||
* REMOVED import com.raytheon.uf.common.dataplugin.IDecoderGettable;
|
||||
*/
|
||||
import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
||||
|
||||
/**
|
||||
|
|
@ -44,6 +46,11 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
|
|||
* ------------ ---------- ----------- --------------------------
|
||||
* Sep 18, 2012 1185 jkorman Extracted from mains
|
||||
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* Required class (IDecoderGettable) no longer exists
|
||||
* Test functionality that is no longer supported (i.e. will not compile)
|
||||
* has been "deactivated" (commented out).
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author jkorman
|
||||
|
|
@ -76,12 +83,16 @@ public class TestMetarToShefTransformer {
|
|||
@Test
|
||||
public void testMetarToShefInteratorB() {
|
||||
PluginDataObject p = new PluginDataObject() {
|
||||
|
||||
/* 08-26-2014 Issue 3365 IDecoderGettable class no longer exists.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
@Override
|
||||
public IDecoderGettable getDecoderGettable() {
|
||||
return null;
|
||||
}
|
||||
|
||||
* 08-26-2014 Issue 3365 IDecoderGettable class no longer exists.
|
||||
* REMOVED END
|
||||
*/
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import junit.framework.Assert;
|
|||
import org.junit.Test;
|
||||
|
||||
import com.raytheon.uf.common.wmo.WMOHeader;
|
||||
import com.raytheon.uf.edex.plugin.taf.decoder.TAFChangeGroupFactory;
|
||||
|
||||
|
||||
|
||||
|
|
@ -37,6 +38,10 @@ import com.raytheon.uf.common.wmo.WMOHeader;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Nov 13, 2013 bclement Initial creation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* TAFChangeGroupFactory API Has changed since this test was created.
|
||||
* Test functionality that is no longer supported by the API (i.e. will not compile)
|
||||
* has been "deactivated" (commented out).
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -64,11 +69,18 @@ public class TAFChangeGroupFactoryTest {
|
|||
+ " TEMPO 1300/1302 VCSH SCT017TCU\n"
|
||||
+ " TEMPO 1310/1312 5000 BCFG SCT015 TX31/1218Z TN23/1311Z=";
|
||||
|
||||
/* 08-26-2014 Issue 3365 TAFChangeGroupFactory API has changed.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
TAFChangeGroupFactory factory = new TAFChangeGroupFactory();
|
||||
|
||||
final String fileName = "/tmp/sbn/manual/nctext/20131112/11/FTXX99_KWBC_121100_20738883.2013111211";
|
||||
String result = factory.checkForLegacyFormat(new WMOHeader(
|
||||
"FTXX99 KWBC 121100".getBytes(), fileName), input);
|
||||
Assert.assertEquals(expected, result);
|
||||
* 08-26-2014 Issue 3365 TAFChangeGroupFactory API has changed.
|
||||
* REMOVED END
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import java.util.Date;
|
|||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.raytheon.uf.common.convert.ConvertUtil;
|
||||
/**
|
||||
* Tests for convert utils
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,241 +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.common.util;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.eclipse.jetty.security.ConstraintMapping;
|
||||
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
||||
import org.eclipse.jetty.security.HashLoginService;
|
||||
import org.eclipse.jetty.security.SecurityHandler;
|
||||
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
|
||||
import org.eclipse.jetty.server.Connector;
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.bio.SocketConnector;
|
||||
import org.eclipse.jetty.server.ssl.SslSocketConnector;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
import org.eclipse.jetty.util.security.Constraint;
|
||||
import org.eclipse.jetty.util.security.Credential;
|
||||
|
||||
import com.raytheon.uf.common.comm.HttpTestConstants;
|
||||
|
||||
/**
|
||||
* This class sets up a Jetty Server that can serve up HttpServlets in either
|
||||
* http or https mode. When in https mode the authentication credentials are
|
||||
* username = user and password = password as defined in TestHttpConstants. This
|
||||
* server can be run as part of a unit test or stand alone from the main.
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Feb 27, 2013 1786 mpduff Initial creation
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author mpduff
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
public class JettyServer {
|
||||
/** The port number */
|
||||
private int port = HttpTestConstants.PORT;
|
||||
|
||||
/** Jetty server instance */
|
||||
private Server server;
|
||||
|
||||
private final ServletContextHandler servletContextHandler;
|
||||
|
||||
/**
|
||||
* Construct the Jetty Server instance.
|
||||
*
|
||||
* @param port
|
||||
* The port number
|
||||
*/
|
||||
public JettyServer(int port) {
|
||||
this.port = port;
|
||||
|
||||
servletContextHandler = new ServletContextHandler(
|
||||
ServletContextHandler.SESSIONS);
|
||||
servletContextHandler.setContextPath("/");
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the server as an SSL server not requiring authentication.
|
||||
*
|
||||
* @throws Exception
|
||||
* if error occurs
|
||||
*/
|
||||
public void startSSLServer() throws Exception {
|
||||
startSSLServer(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the server as an SSL server
|
||||
*
|
||||
* @param useAuthentication
|
||||
* true to use authentication. user/password
|
||||
*
|
||||
* @throws Exception
|
||||
* if error occurs
|
||||
*/
|
||||
public void startSSLServer(boolean useAuthentication) throws Exception {
|
||||
String keystorePath = TestUtil.getFileForResource(JettyServer.class,
|
||||
"/http/keystore").getAbsolutePath();
|
||||
|
||||
server = new Server();
|
||||
|
||||
SslSocketConnector sslConnector = new SslSocketConnector();
|
||||
sslConnector.setPort(port);
|
||||
sslConnector.setMaxIdleTime(30000);
|
||||
sslConnector.setKeystore(keystorePath);
|
||||
sslConnector.setPassword(HttpTestConstants.PASSWD);
|
||||
sslConnector.setKeyPassword(HttpTestConstants.PASSWD);
|
||||
sslConnector.setTruststore(keystorePath);
|
||||
sslConnector.setTrustPassword(HttpTestConstants.PASSWD);
|
||||
|
||||
server.addConnector(sslConnector);
|
||||
|
||||
if (useAuthentication) {
|
||||
servletContextHandler.setSecurityHandler(basicAuth(
|
||||
HttpTestConstants.USERNAME, HttpTestConstants.PASSWD,
|
||||
HttpTestConstants.REALM));
|
||||
}
|
||||
server.setHandler(servletContextHandler);
|
||||
|
||||
server.start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the server as a standard http server
|
||||
*
|
||||
* @throws Exception
|
||||
* exception
|
||||
*/
|
||||
public void startServer() throws Exception {
|
||||
server = new Server();
|
||||
Connector connector = new SocketConnector();
|
||||
connector.setPort(port);
|
||||
server.setConnectors(new Connector[] { connector });
|
||||
server.addConnector(connector);
|
||||
server.setHandler(servletContextHandler);
|
||||
server.start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop the server.
|
||||
*
|
||||
* @throws Exception
|
||||
* If error occurs
|
||||
*/
|
||||
public void stopServer() throws Exception {
|
||||
server.setStopAtShutdown(true);
|
||||
server.setGracefulShutdown(1000);
|
||||
server.stop();
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a servlet to the server.
|
||||
*
|
||||
* @param servlet
|
||||
* The servlet to add
|
||||
* @param pathSpec
|
||||
* The path of the servlet
|
||||
*/
|
||||
public void addServlet(HttpServlet servlet, String pathSpec) {
|
||||
servletContextHandler.addServlet(new ServletHolder(servlet), pathSpec);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a SecurityHandler for the SSL server.
|
||||
*
|
||||
* @param username
|
||||
* The username
|
||||
* @param password
|
||||
* The password
|
||||
* @param realm
|
||||
* The realm name
|
||||
* @return The SecurityHandler
|
||||
*/
|
||||
private final SecurityHandler basicAuth(String username, String password,
|
||||
String realm) {
|
||||
|
||||
HashLoginService l = new HashLoginService();
|
||||
l.putUser(username, Credential.getCredential(password),
|
||||
new String[] { HttpTestConstants.USERNAME });
|
||||
l.setName(realm);
|
||||
|
||||
Constraint constraint = new Constraint();
|
||||
constraint.setName(Constraint.__BASIC_AUTH);
|
||||
constraint.setRoles(new String[] { HttpTestConstants.USERNAME });
|
||||
constraint.setAuthenticate(true);
|
||||
|
||||
ConstraintMapping cm = new ConstraintMapping();
|
||||
cm.setConstraint(constraint);
|
||||
cm.setPathSpec("/*");
|
||||
|
||||
ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
|
||||
csh.setAuthenticator(new BasicAuthenticator());
|
||||
// csh.setRealmName("myrealm");
|
||||
csh.setRealmName(HttpTestConstants.REALM);
|
||||
csh.addConstraintMapping(cm);
|
||||
csh.setLoginService(l);
|
||||
|
||||
return csh;
|
||||
}
|
||||
|
||||
/**
|
||||
* A test servlet
|
||||
*/
|
||||
public class TestServletInstance extends HttpServlet {
|
||||
|
||||
@Override
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
|
||||
throws ServletException, IOException {
|
||||
resp.getWriter().print("<h1>Test Successful</h1>");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Main method. Uncomment to run in the desired mode.
|
||||
*
|
||||
* @param args
|
||||
* @throws Exception
|
||||
*/
|
||||
public static void main(String[] args) throws Exception {
|
||||
// Https
|
||||
JettyServer server = new JettyServer(8443);
|
||||
server.addServlet(server.new TestServletInstance(), "/test");
|
||||
server.startSSLServer();
|
||||
|
||||
// Http
|
||||
// JettyServer server = new JettyServer(8888);
|
||||
// server.addServlet(server.new TestServletInstance(), "/test");
|
||||
// server.startServer();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,232 +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.common.util;
|
||||
|
||||
import javax.servlet.Servlet;
|
||||
|
||||
import org.eclipse.jetty.security.ConstraintMapping;
|
||||
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
||||
import org.eclipse.jetty.security.HashLoginService;
|
||||
import org.eclipse.jetty.security.SecurityHandler;
|
||||
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.handler.HandlerCollection;
|
||||
import org.eclipse.jetty.server.nio.SelectChannelConnector;
|
||||
import org.eclipse.jetty.server.ssl.SslSocketConnector;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
import org.eclipse.jetty.servlets.ProxyServlet;
|
||||
import org.eclipse.jetty.util.security.Constraint;
|
||||
import org.eclipse.jetty.util.security.Credential;
|
||||
|
||||
/**
|
||||
* This class sets up a Jetty Server that can serve up Proxied HttpServlets in
|
||||
* either http or https mode.
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Jun 11, 2013 dhladky Initial creation
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author dhladky
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
public class ProxiedJettyServer {
|
||||
/** The https port number */
|
||||
private int httpsport = 8888;
|
||||
|
||||
/** HTTP port number */
|
||||
private int httpport = 8085;
|
||||
|
||||
/** The realm string **/
|
||||
private final String realm;
|
||||
|
||||
/** Jetty server instance */
|
||||
private Server server;
|
||||
|
||||
/** user for checks **/
|
||||
private String user = "user";
|
||||
|
||||
/** password for checks **/
|
||||
private String password = "password";
|
||||
|
||||
private final ServletContextHandler servletContextHandler;
|
||||
|
||||
/**
|
||||
* Start the Proxied servlet
|
||||
*
|
||||
* @param redirectHost
|
||||
* @param port
|
||||
* @param context
|
||||
* @param realm
|
||||
* @param user
|
||||
* @param password
|
||||
*/
|
||||
public ProxiedJettyServer(String redirectUrl, Integer httpport,
|
||||
Integer httpsport, String context, String realm, String user,
|
||||
String password) {
|
||||
servletContextHandler = new ServletContextHandler(
|
||||
ServletContextHandler.SESSIONS);
|
||||
servletContextHandler.setContextPath("/");
|
||||
ProxyServlet.Transparent servlet = new ProxyServlet.Transparent();
|
||||
ServletHolder servletHolder = new ServletHolder(servlet);
|
||||
servletHolder.setInitParameter("ProxyTo", redirectUrl);
|
||||
servletHolder.setInitParameter("Prefix", "/" + context);
|
||||
addServlet(servletHolder, "/" + context + "/*");
|
||||
|
||||
this.httpport = httpport;
|
||||
this.httpsport = httpsport;
|
||||
this.realm = realm;
|
||||
this.user = user;
|
||||
this.password = password;
|
||||
|
||||
server = new Server();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the server as an SSL server
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public void startSSLServer() throws Exception {
|
||||
String keystorePath = TestUtil.getFileForResource(JettyServer.class,
|
||||
"/http/keystore").getAbsolutePath();
|
||||
|
||||
SslSocketConnector sslConnector = new SslSocketConnector();
|
||||
sslConnector.setPort(httpsport);
|
||||
sslConnector.setMaxIdleTime(30000);
|
||||
sslConnector.setKeystore(keystorePath);
|
||||
sslConnector.setPassword(password);
|
||||
sslConnector.setKeyPassword(password);
|
||||
sslConnector.setTruststore(keystorePath);
|
||||
sslConnector.setTrustPassword(password);
|
||||
|
||||
server.addConnector(sslConnector);
|
||||
|
||||
servletContextHandler.setSecurityHandler(basicAuth(user, password,
|
||||
realm));
|
||||
server.setHandler(servletContextHandler);
|
||||
|
||||
server.start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the server as a standard http server
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public void startServer() throws Exception {
|
||||
server = new Server(httpsport);
|
||||
|
||||
server.setHandler(servletContextHandler);
|
||||
|
||||
server.start();
|
||||
|
||||
}
|
||||
|
||||
public void stopServer() throws Exception {
|
||||
server.stop();
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a servlet to the server.
|
||||
*
|
||||
* @param servlet
|
||||
* The servlet to add
|
||||
* @param pathSpec
|
||||
* The path of the servlet
|
||||
*/
|
||||
public void addServlet(Servlet servlet, String pathSpec) {
|
||||
addServlet(new ServletHolder(servlet), pathSpec);
|
||||
}
|
||||
|
||||
public void addServlet(ServletHolder holder, String pathSpec) {
|
||||
servletContextHandler.addServlet(holder, pathSpec);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a SecurityHandler for the SSL server.
|
||||
*
|
||||
* @param username
|
||||
* The username
|
||||
* @param password
|
||||
* The password
|
||||
* @param realm
|
||||
* The realm name
|
||||
* @return The SecurityHandler
|
||||
*/
|
||||
private final SecurityHandler basicAuth(String username, String password,
|
||||
String realm) {
|
||||
|
||||
HashLoginService l = new HashLoginService();
|
||||
l.putUser(username, Credential.getCredential(password),
|
||||
new String[] { user });
|
||||
l.setName(realm);
|
||||
|
||||
Constraint constraint = new Constraint();
|
||||
constraint.setName(Constraint.__BASIC_AUTH);
|
||||
constraint.setRoles(new String[] { user });
|
||||
constraint.setAuthenticate(true);
|
||||
|
||||
ConstraintMapping cm = new ConstraintMapping();
|
||||
cm.setConstraint(constraint);
|
||||
cm.setPathSpec("/*");
|
||||
|
||||
ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
|
||||
csh.setAuthenticator(new BasicAuthenticator());
|
||||
csh.setRealmName(realm);
|
||||
csh.addConstraintMapping(cm);
|
||||
csh.setLoginService(l);
|
||||
|
||||
return csh;
|
||||
}
|
||||
|
||||
private void addConnector(SelectChannelConnector connector) {
|
||||
server.addConnector(connector);
|
||||
}
|
||||
|
||||
private void setHandler(HandlerCollection handlers) {
|
||||
server.setHandler(handlers);
|
||||
}
|
||||
|
||||
// I kept this because I use it
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
String redirectHost = args[0];
|
||||
Integer port = Integer.parseInt(args[1]);
|
||||
Integer sport = Integer.parseInt(args[2]);
|
||||
String context = args[3];
|
||||
String realm = args[4];
|
||||
String user = args[5];
|
||||
String password = args[6];
|
||||
|
||||
// Run this server
|
||||
ProxiedJettyServer server = new ProxiedJettyServer(redirectHost, port,
|
||||
sport, context, realm, user, password);
|
||||
server.startSSLServer();
|
||||
}
|
||||
}
|
||||
|
|
@ -23,9 +23,12 @@ import static org.junit.Assert.assertFalse;
|
|||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.raytheon.uf.edex.core.modes.EdexMode;
|
||||
|
|
@ -52,13 +55,34 @@ public class EdexModeTest {
|
|||
|
||||
@Test
|
||||
public void testExcludedPatternByIncludedModeIsExcluded() {
|
||||
EdexMode includedMode = new EdexMode(Arrays.asList(".*include.*"),
|
||||
Arrays.asList(".*exclude.*"),
|
||||
Collections.<EdexMode> emptyList());
|
||||
|
||||
EdexMode mode = new EdexMode(Arrays.asList(".*someother.*"),
|
||||
Collections.<String> emptyList(), Arrays.asList(includedMode));
|
||||
mode.init();
|
||||
/* EdexMode(List<String> includeList, List<String> excludeList,
|
||||
ArrayList<String> arrayList) */
|
||||
|
||||
List<String> includeList = new ArrayList<String>();
|
||||
includeList.add(".*include.*");
|
||||
List<String> excludeList = new ArrayList<String>();
|
||||
excludeList.add(".*exclude.*");
|
||||
ArrayList<String> emptyList = new ArrayList<String>();
|
||||
|
||||
EdexMode includedMode = new EdexMode(includeList,
|
||||
excludeList, emptyList);
|
||||
|
||||
List<String> someotherList = new ArrayList<String>();
|
||||
someotherList.add(".*someother.*");
|
||||
List<String> excludeEmptyList = new ArrayList<String>();
|
||||
ArrayList<String> modeList = new ArrayList<String>();
|
||||
//TODO HERE THIS WILL NOT WORK modeList.add(includedMode);
|
||||
EdexMode mode = new EdexMode(someotherList, excludeEmptyList,
|
||||
modeList);
|
||||
|
||||
Map<String, EdexMode> allModes = new HashMap<String, EdexMode>();
|
||||
try {
|
||||
mode.init(allModes);
|
||||
}
|
||||
catch(Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
File file = new File("./res/spring/exclude.xml");
|
||||
assertFalse(mode.accept(file, file.getAbsolutePath()));
|
||||
|
|
@ -66,15 +90,24 @@ public class EdexModeTest {
|
|||
|
||||
@Test
|
||||
public void testIncludedPatternByIncludedModeCanBeExcluded() {
|
||||
EdexMode includedMode = new EdexMode(Arrays.asList(".*include.*"),
|
||||
/* EdexMode includedMode = new EdexMode(Arrays.asList(".*include.*"),
|
||||
Collections.<String> emptyList(),
|
||||
Collections.<EdexMode> emptyList());
|
||||
Collections.<EdexMode> emptyList());*/
|
||||
List<String> includeList = new ArrayList<String>();
|
||||
includeList.add(".*include.*");
|
||||
List<String> excludeList = new ArrayList<String>();
|
||||
ArrayList<String> emptyList = new ArrayList<String>();
|
||||
|
||||
EdexMode includedMode = new EdexMode(includeList,
|
||||
excludeList, emptyList);
|
||||
|
||||
/* TODO HERE REINSTATE
|
||||
EdexMode mode = new EdexMode(Collections.<String> emptyList(),
|
||||
Arrays.asList(".*include.*"), Arrays.asList(includedMode));
|
||||
mode.init();
|
||||
|
||||
File file = new File("./res/spring/include.xml");
|
||||
assertFalse(mode.accept(file, file.getAbsolutePath()));
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ 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()
|
||||
|
|
@ -49,5 +50,6 @@ public class EnvAttributePropertyInjector {
|
|||
|
||||
attrNamesConfig.setProperty(attributeName, attributeValue);
|
||||
envConfig.setProperty(attributeValue, propertyValue);
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@ import org.junit.Test;
|
|||
|
||||
import com.raytheon.edex.esb.Headers;
|
||||
import com.raytheon.uf.edex.decodertools.core.DecoderTools;
|
||||
import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
||||
*/
|
||||
|
||||
/**
|
||||
* Test {@link TimeTools}.
|
||||
|
|
@ -43,6 +45,10 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Feb 19, 2013 1636 rferrel Initial creation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* Required class (ICheckAllowArchive) no longer exists
|
||||
* Test functionality that is no longer supported (i.e. will not compile)
|
||||
* has been "deactivated" (commented out).
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -54,6 +60,9 @@ public class TimeToolsAllowArchiveTest {
|
|||
|
||||
@BeforeClass
|
||||
public static void classSetup() {
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
TimeTools.checkAllowArchive = new ICheckAllowArchive() {
|
||||
|
||||
@Override
|
||||
|
|
@ -61,6 +70,9 @@ public class TimeToolsAllowArchiveTest {
|
|||
return true;
|
||||
}
|
||||
};
|
||||
* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED END
|
||||
*/
|
||||
ITimeService service = new ITimeService() {
|
||||
@Override
|
||||
public Calendar getCalendar() {
|
||||
|
|
@ -91,17 +103,29 @@ public class TimeToolsAllowArchiveTest {
|
|||
Headers header = new Headers();
|
||||
header.put(DecoderTools.INGEST_FILE_NAME, data[1]);
|
||||
|
||||
Calendar c = TimeTools.findDataTime(data[2], header);
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
sdf.setTimeZone(c.getTimeZone());
|
||||
|
||||
String cs = sdf.format(c.getTime());
|
||||
return expected.equals(cs);
|
||||
* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED END
|
||||
*/
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
@Test
|
||||
public void test() {
|
||||
assertTrue(TimeTools.allowArchive());
|
||||
}
|
||||
* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED END
|
||||
*/
|
||||
|
||||
@Test
|
||||
public void test001() {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,9 @@ import java.util.TimeZone;
|
|||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
||||
*/
|
||||
|
||||
/**
|
||||
* Test {@link TimeTools}.
|
||||
|
|
@ -40,6 +42,10 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Feb 19, 2013 1636 rferrel Initial creation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
* Required class (ICheckAllowArchive) no longer exists
|
||||
* Test functionality that is no longer supported (i.e. will not compile)
|
||||
* has been "deactivated" (commented out).
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -48,6 +54,12 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools.ICheckAllowArchive;
|
|||
*/
|
||||
|
||||
public class TimeToolsNoArchiveTest {
|
||||
|
||||
ITimeService it;
|
||||
|
||||
/* 08-26-2014 Issue 3365 ICheckAllowArchive class no longer exists.
|
||||
* REMOVED BEGIN
|
||||
*
|
||||
@BeforeClass
|
||||
public static void classSetup() {
|
||||
TimeTools.checkAllowArchive = new ICheckAllowArchive() {
|
||||
|
|
@ -80,7 +92,9 @@ public class TimeToolsNoArchiveTest {
|
|||
public void test() {
|
||||
assertFalse(TimeTools.allowArchive());
|
||||
}
|
||||
|
||||
* 08-26-2014 Issue 3365 Functionality is no longer supported.
|
||||
* REMOVED END
|
||||
*/
|
||||
@Test
|
||||
public void test001() {
|
||||
String[] data = new String[] { "test001",
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import java.util.Map;
|
|||
|
||||
import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.NotificationListener;
|
||||
|
||||
import com.raytheon.uf.common.registry.services.RegistrySOAPServices;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices;
|
||||
import com.raytheon.uf.edex.registry.ebxml.services.notification.listeners.WebServiceNotificationListener;
|
||||
|
||||
/**
|
||||
|
|
@ -40,6 +40,7 @@ import com.raytheon.uf.edex.registry.ebxml.services.notification.listeners.WebSe
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Apr 17, 2013 1672 djohnson Initial creation
|
||||
* Aug 26, 2014 3365 ccody Separate Data Delivery tests out of AWIPS 2 baseline.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue