Merge "Issue #1726 change how swt is imported to tests, uncomment some tests that now work again" into development

Former-commit-id: 724db0f3ef [formerly e1ef074936] [formerly d74a7639ba [formerly c1b8ad9acaa8a5f5397c833a9edb5db23eaa5981]]
Former-commit-id: d74a7639ba
Former-commit-id: eb0ccfe92f
This commit is contained in:
Nate Jensen 2013-08-05 12:45:29 -05:00 committed by Gerrit Code Review
commit 510b70744d
5 changed files with 13 additions and 31 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry excluding="com/raytheon/viz/gfe/ui/runtimeui/TestSmartScript.java|com/raytheon/viz/gfe/ui/runtimeui/TestHazardUtils.java|com/raytheon/viz/gfe/core/parm/TestParmManager.java|com/raytheon/viz/gfe/core/parm/TestParm.java|gov/noaa/nws/ncep/gempak/parameters/title/TITLETest.java|gov/noaa/nws/ncep/gempak/parameters/marker/MARKERTest.java|gov/noaa/nws/ncep/gempak/parameters/line/LineDataStringParserTest.java|gov/noaa/nws/ncep/gempak/parameters/hilo/HILOTest.java|gov/noaa/nws/ncep/gempak/parameters/colors/COLORSTest.java|gov/noaa/nws/ncep/gempak/parameters/colorbar/CLRBARTest.java" kind="src" path="unit"/> <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|com/raytheon/viz/gfe/ui/runtimeui/TestSmartScript.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="deploy"/>
<classpathentry kind="src" path="resources"/> <classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="integration"/> <classpathentry kind="src" path="integration"/>
@ -58,8 +58,6 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.measure"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.measure"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.vecmath"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/javax.vecmath"/>
<classpathentry exported="true" kind="lib" path="lib/h2-1.3.171.jar"/> <classpathentry exported="true" kind="lib" path="lib/h2-1.3.171.jar"/>
<classpathentry kind="lib" path="lib/swt_gtk_linux_x86_64.jar"/>
<classpathentry kind="lib" path="lib/swt_gtk_linux_x86.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.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.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.viz.ui"/>
@ -154,5 +152,7 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.hamcrest"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.hamcrest"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.mockito"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.mockito"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk.linux.x86_3.8.1.v3836b.jar"/>
<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk.linux.x86_64_3.8.1.v3836b.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

Binary file not shown.

Binary file not shown.

View file

@ -1,20 +1,20 @@
package gov.noaa.nws.ncep.gempak.parameters.colors; package gov.noaa.nws.ncep.gempak.parameters.colors;
import static org.junit.Assert.assertEquals;
import gov.noaa.nws.ncep.gempak.parameters.colors.COLORS; import gov.noaa.nws.ncep.gempak.parameters.colors.COLORS;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
public class COLORSTest { public class COLORSTest {
@Test @Test
public void testCOLORSNormalCase() { public void testCOLORSNormalCase() {
COLORS colors = new COLORS("1;2;4"); COLORS colors = new COLORS("1;2;4");
assertEquals(colors.getFirstColor(), new RGB(255, 228, 220)); assertEquals(colors.getFirstColor(), new RGB(255, 228, 220));
assertEquals(colors.getColors()[1], new RGB(255, 0, 0)); assertEquals(colors.getColors()[1], new RGB(255, 0, 0));
assertEquals(colors.getColors()[0], new RGB(255, 228, 220)); assertEquals(colors.getColors()[0], new RGB(255, 228, 220));
assertEquals(colors.getColors()[2], new RGB(0, 0, 255)); assertEquals(colors.getColors()[2], new RGB(0, 0, 255));
} }
} }

View file

@ -1,18 +0,0 @@
package gov.noaa.nws.ncep.gempak.parameters.marker;
import static org.junit.Assert.*;
import org.eclipse.swt.graphics.RGB;
import org.junit.Test;
import gov.noaa.nws.ncep.gempak.parameters.marker.MARKER;
public class MARKERTest {
@Test
public void testMarkerNormalCase() {
System.out.println("Can not use JUNIT testing because MARKER uses Localization based on CAVE!");
}
}