Skip to content

Commit 91a3e6a

Browse files
author
pdavidc
committed
Removed unit tests for Shapefile and MilStd2525 that require on a network connection
1 parent e896675 commit 91a3e6a

File tree

3 files changed

+53
-94
lines changed

3 files changed

+53
-94
lines changed

‎test/gov/nasa/worldwind/formats/shapefile/ShapefileTest.java‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public class ShapefileTest
2424
{
2525
private static final String STATE_BOUNDS_PATH = "testData/shapefiles/state_bounds.shp";
2626
private static final String WORLD_BORDERS_PATH = "testData/shapefiles/TM_WORLD_BORDERS-0.3.shp";
27-
private static final String SPRINGFIELD_URBAN_GROWTH_URL
28-
= "https://worldwind.arc.nasa.gov/java/apps/springfield/SPR_UGB.shp";
27+
private static final String SPRINGFIELD_URBAN_GROWTH_PATH = "testData/shapefiles/SPR_UGB.shp";
2928

3029
//////////////////////////////////////////////////////////
3130
// Test Basic Reading
@@ -59,33 +58,33 @@ public void testOpenPath()
5958
shapefile.close();
6059
}
6160

62-
@Test
63-
public void testOpenURL() throws MalformedURLException
64-
{
65-
Shapefile shapefile = new Shapefile(new URL(SPRINGFIELD_URBAN_GROWTH_URL));
66-
assertEquals("Shape type is not as expected", Shapefile.SHAPE_POLYGON, shapefile.getShapeType());
67-
68-
while (shapefile.hasNext())
69-
{
70-
assertRecordAppearsNormal(shapefile, shapefile.nextRecord());
71-
}
72-
73-
shapefile.close();
74-
}
75-
76-
@Test
77-
public void testOpenURLString()
78-
{
79-
Shapefile shapefile = new Shapefile(SPRINGFIELD_URBAN_GROWTH_URL);
80-
assertEquals("Shape type is not as expected", Shapefile.SHAPE_POLYGON, shapefile.getShapeType());
81-
82-
while (shapefile.hasNext())
83-
{
84-
assertRecordAppearsNormal(shapefile, shapefile.nextRecord());
85-
}
86-
87-
shapefile.close();
88-
}
61+
// @Test
62+
// public void testOpenURL() throws MalformedURLException
63+
// {
64+
// Shapefile shapefile = new Shapefile(new URL(SPRINGFIELD_URBAN_GROWTH_URL));
65+
// assertEquals("Shape type is not as expected", Shapefile.SHAPE_POLYGON, shapefile.getShapeType());
66+
//
67+
// while (shapefile.hasNext())
68+
// {
69+
// assertRecordAppearsNormal(shapefile, shapefile.nextRecord());
70+
// }
71+
//
72+
// shapefile.close();
73+
// }
74+
//
75+
// @Test
76+
// public void testOpenURLString()
77+
// {
78+
// Shapefile shapefile = new Shapefile(SPRINGFIELD_URBAN_GROWTH_URL);
79+
// assertEquals("Shape type is not as expected", Shapefile.SHAPE_POLYGON, shapefile.getShapeType());
80+
//
81+
// while (shapefile.hasNext())
82+
// {
83+
// assertRecordAppearsNormal(shapefile, shapefile.nextRecord());
84+
// }
85+
//
86+
// shapefile.close();
87+
// }
8988

9089
@Test
9190
public void testOpenSingleInputStream() throws Exception
@@ -126,7 +125,7 @@ public void testOpenMultipleInputStreams() throws Exception
126125
@Test
127126
public void testUTMCoordinates()
128127
{
129-
Shapefile shapefile = new Shapefile(SPRINGFIELD_URBAN_GROWTH_URL);
128+
Shapefile shapefile = new Shapefile(SPRINGFIELD_URBAN_GROWTH_PATH);
130129
assertEquals("Shape type is not as expected", Shapefile.SHAPE_POLYGON, shapefile.getShapeType());
131130
assertShapefileAppearsNormal(shapefile);
132131
shapefile.close();

test/gov/nasa/worldwind/symbology/milstd2525/IconRetrievalTest.java renamed to test/gov/nasa/worldwind/symbology/milstd2525/MilStd2525IconRetrieverTest.java

Lines changed: 23 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,14 @@
1717
import static org.junit.Assert.*;
1818

1919
@RunWith(JUnit4.class)
20-
public class IconRetrievalTest
20+
public class MilStd2525IconRetrieverTest
2121
{
2222
// TODO: test all possible values for Standard Identity and Status
2323
// TODO: test unframed icons
2424

2525
// This path should correspond to the location of the appropriate symbology source icons on your system
2626
private final static String LOCAL_SYMBOLS_ZIP = "jar:file:testData/milstd2525-symbols.zip!";
2727

28-
//////////////////////////////////////////////////////////
29-
// Test retrieval of a MilStd2525 icon from both a remote
30-
// server and the local file system.
31-
//////////////////////////////////////////////////////////
32-
33-
@Test
34-
public void testServerRetrieval()
35-
{
36-
MilStd2525IconRetriever symGen = new MilStd2525IconRetriever(MilStd2525Constants.DEFAULT_ICON_RETRIEVER_PATH);
37-
AVListImpl params = new AVListImpl();
38-
BufferedImage img = symGen.createIcon("SUAPC----------", params);
39-
assertNotNull(img);
40-
}
41-
4228
//////////////////////////////////////////////////////////
4329
// Test parsing of the Symbol Code.
4430
// MilStd2525 SymCodes should be exactly 15 characters.
@@ -757,31 +743,18 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
757743
}
758744
}
759745

760-
// public static void main(String[] args)
761-
// {
762-
// TestSuite testSuite = new TestSuite();
763-
// testSuite.addTestSuite(RetrievalTests.class);
764-
// testSuite.addTestSuite(ParsingTests.class);
765-
// testSuite.addTestSuite(CodeTests.class);
766-
// //testSuite.addTestSuite(WarfightingFunctionIDTests.class);
767-
// //testSuite.addTestSuite(SignalsIntelligenceFunctionIDTests.class);
768-
// //testSuite.addTestSuite(StabilityOperationsFunctionIDTests.class);
769-
// testSuite.addTestSuite(EmergencyManagementFunctionIDTests.class);
770-
// new TestRunner().doRun(testSuite);
771-
// }
772-
773746
//////////////////////
774747
// Warfighting
775748

776-
private final static String[] WarfightingUnknownFunctionIDs = {"------"};
749+
private static final String[] WarfightingUnknownFunctionIDs = {"------"};
777750

778-
private final static String[] WarfightingSpaceFunctionIDs = {"------",
751+
private static final String[] WarfightingSpaceFunctionIDs = {"------",
779752
"S-----",
780753
"V-----",
781754
"T-----",
782755
"L-----"};
783756

784-
private final static String[] WarfightingAirFunctionIDs = {"------",
757+
private static final String[] WarfightingAirFunctionIDs = {"------",
785758
"C-----",
786759
"M-----",
787760
"MF----",
@@ -865,7 +838,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
865838
"CH----",
866839
"CL----"};
867840

868-
private final static String[] WarfightingGroundFunctionIDs = {"------",
841+
private static final String[] WarfightingGroundFunctionIDs = {"------",
869842
"U-----",
870843
"UC----",
871844
"UCD---",
@@ -1469,7 +1442,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
14691442
"IX----",
14701443
"IXH---"};
14711444

1472-
private final static String[] WarfightingSeaSurfaceFunctionIDs = {"------",
1445+
private static final String[] WarfightingSeaSurfaceFunctionIDs = {"------",
14731446
"C-----",
14741447
"CL----",
14751448
"CLCV--",
@@ -1543,7 +1516,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
15431516
"XP----",
15441517
"O-----"};
15451518

1546-
private final static String[] WarfightingSubsurfaceFunctionIDs = {"------",
1519+
private static final String[] WarfightingSubsurfaceFunctionIDs = {"------",
15471520
"S-----",
15481521
"SF----",
15491522
"SB----",
@@ -1624,7 +1597,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
16241597
"V-----",
16251598
"X-----"};
16261599

1627-
private final static String[] WarfightingSOFFunctionIDs = {"------",
1600+
private static final String[] WarfightingSOFFunctionIDs = {"------",
16281601
"A-----",
16291602
"AF----",
16301603
"AFA---",
@@ -1658,7 +1631,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
16581631
//////////////////////
16591632
// Signals Intelligence
16601633

1661-
private static String[] SignalsIntelligenceSpaceFunctionIDs = {//"------",
1634+
private static final String[] SignalsIntelligenceSpaceFunctionIDs = {//"------",
16621635
//"S-----",
16631636
//"SC----", // icons not used
16641637
"SCD---",
@@ -1671,7 +1644,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
16711644
"SRS---",
16721645
"SRU---"};
16731646

1674-
private static String[] SignalsIntelligenceAirFunctionIDs = {//"------",
1647+
private static final String[] SignalsIntelligenceAirFunctionIDs = {//"------",
16751648
//"S-----",
16761649
//"SC----", // icons not used
16771650
"SCC---",
@@ -1697,7 +1670,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
16971670
"SRTT--",
16981671
"SRU---"};
16991672

1700-
private static String[] SignalsIntelligenceGroundFunctionIDs = {//"------",
1673+
private static final String[] SignalsIntelligenceGroundFunctionIDs = {//"------",
17011674
//"S-----",
17021675
//"SC----", // icons not used
17031676
"SCC---",
@@ -1728,7 +1701,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
17281701
"SRTT--",
17291702
"SRU---"};
17301703

1731-
private static String[] SignalsIntelligenceSeaSurfaceFunctionIDs = {//"------",
1704+
private static final String[] SignalsIntelligenceSeaSurfaceFunctionIDs = {//"------",
17321705
//"S-----",
17331706
//"SC----", // icons not used
17341707
"SCC---",
@@ -1757,7 +1730,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
17571730
"SRTT--",
17581731
"SRU---"};
17591732

1760-
private static String[] SignalsIntelligenceSubsurfaceFunctionIDs = {//"------",
1733+
private static final String[] SignalsIntelligenceSubsurfaceFunctionIDs = {//"------",
17611734
//"S-----",
17621735
//"SC----", // icons not used
17631736
"SCO---",
@@ -1775,7 +1748,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
17751748
///////////////////////////////
17761749
// Stability Operations
17771750

1778-
private static String[] StabilityOperationsViolentActivitiesFunctionIDs = {//"------",
1751+
private static final String[] StabilityOperationsViolentActivitiesFunctionIDs = {//"------",
17791752
"A-----",
17801753
"M-----",
17811754
"MA----",
@@ -1789,13 +1762,13 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
17891762
"E-----",
17901763
"EI----"};
17911764

1792-
private static String[] StabilityOperationsLocationsFunctionIDs = {//"------",
1765+
private static final String[] StabilityOperationsLocationsFunctionIDs = {//"------",
17931766
"B-----",
17941767
"G-----",
17951768
"W-----",
17961769
"M-----"};
17971770

1798-
private static String[] StabilityOperationsOperationsFunctionIDs = {//"------",
1771+
private static final String[] StabilityOperationsOperationsFunctionIDs = {//"------",
17991772
"P-----",
18001773
//"R-----", // icon not used
18011774
"RW----",
@@ -1823,7 +1796,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
18231796
"CB----",
18241797
"CC----"};
18251798

1826-
private static String[] StabilityOperationsItemsFunctionIDs = {//"------",
1799+
private static final String[] StabilityOperationsItemsFunctionIDs = {//"------",
18271800
"R-----",
18281801
"S-----",
18291802
"G-----",
@@ -1832,26 +1805,26 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
18321805
"D-----",
18331806
"F-----"};
18341807

1835-
private static String[] StabilityOperationsIndividualFunctionIDs = {"------",
1808+
private static final String[] StabilityOperationsIndividualFunctionIDs = {"------",
18361809
"A-----",
18371810
"B-----",
18381811
"C-----"};
18391812

1840-
private static String[] StabilityOperationsNonmilitaryFunctionIDs = {"------",
1813+
private static final String[] StabilityOperationsNonmilitaryFunctionIDs = {"------",
18411814
"A-----",
18421815
"B-----",
18431816
"C-----",
18441817
"D-----",
18451818
"E-----",
18461819
"F-----"};
18471820

1848-
private static String[] StabilityOperationsRapeFunctionIDs = {"------",
1821+
private static final String[] StabilityOperationsRapeFunctionIDs = {"------",
18491822
"A-----"};
18501823

18511824
/////////////////////////////
18521825
// Emergency Management
18531826

1854-
private static String[] EmergencyManagementIncidentsFunctionIDs = {//"------",
1827+
private static final String[] EmergencyManagementIncidentsFunctionIDs = {//"------",
18551828
"A-----",
18561829
"AC----",
18571830
"B-----",
@@ -1893,7 +1866,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
18931866
"H-----",
18941867
"HA----"};
18951868

1896-
// private static String[] EmergencyManagementNaturalEventsFunctionIDs = {//"------",
1869+
// private static final String[] EmergencyManagementNaturalEventsFunctionIDs = {//"------",
18971870
// //"A-----", // icon not used
18981871
// "AA----",
18991872
// "AB----",
@@ -1913,7 +1886,7 @@ public void testEmergencyManagement_InfrastructureFunctionIDRetrieval()
19131886
// "CD----",
19141887
// "CE----"};
19151888

1916-
private static String[] EmergencyManagementOperationsFunctionIDs = {//"-----------",
1889+
private static final String[] EmergencyManagementOperationsFunctionIDs = {//"-----------",
19171890
"A-----H----",
19181891
"AA---------",
19191892
"AB---------",

test/gov/nasa/worldwind/symbology/milstd2525/PointGraphicRetrievalTest.java renamed to test/gov/nasa/worldwind/symbology/milstd2525/MilStd2525PointGraphicRetrieverTest.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,14 @@
1717
import static org.junit.Assert.*;
1818

1919
@RunWith(JUnit4.class)
20-
public class PointGraphicRetrievalTest
20+
public class MilStd2525PointGraphicRetrieverTest
2121
{
2222
// This path should correspond to the location of the appropriate symbology source icons on your system
2323
private final static String LOCAL_SYMBOLS_ZIP = "jar:file:testData/milstd2525-symbols.zip!";
2424

2525
/** Valid status characters for MIL-STD-2525C tactical graphics (see Table B-I, pg. 305). */
2626
private static final char[] ALL_STATUS = {'A', 'S', 'P', 'K'};
2727

28-
//////////////////////////////////////////////////////////
29-
// Test retrieval of a MilStd2525 point graphic from both a remote
30-
// server and the local file system.
31-
//////////////////////////////////////////////////////////
32-
33-
@Test
34-
public void testServerRetrieval()
35-
{
36-
IconRetriever symGen = new MilStd2525PointGraphicRetriever(MilStd2525Constants.DEFAULT_ICON_RETRIEVER_PATH);
37-
BufferedImage img = symGen.createIcon("GFFPPCB-------X", null);
38-
assertNotNull(img);
39-
}
40-
4128
//////////////////////////////////////////////////////////
4229
// Test parsing of the Symbol Code.
4330
// MilStd2525 SymCodes should be exactly 15 characters.

0 commit comments

Comments
 (0)