Adjusted unit tests KMLExportTest and NetworkStatusTest to run while …

…offline - closes #38
NASAWorldWind · Dec 8, 2016 · b939636 · b939636
1 parent c0f0373
commit b939636
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 26 deletions.
diff --git a/src/gov/nasa/worldwind/util/BasicNetworkStatus.java b/src/gov/nasa/worldwind/util/BasicNetworkStatus.java
@@ -400,18 +400,4 @@ protected static boolean isHostReachable(String hostName)
 
         return false;
     }
-//
-//    public static void main(String[] args)
-//    {
-//        try
-//        {
-//            NetworkStatus ns = new BasicNetworkStatus();
-//            boolean tf = ns.isWorlWindServerUnavailable();
-//            tf = ns.isNetworkUnavailable();
-//        }
-//        catch (Exception e)
-//        {
-//            e.printStackTrace();
-//        }
-//    }
 }
diff --git a/test/gov/nasa/worldwind/geom/MatrixTest.java b/test/gov/nasa/worldwind/geom/MatrixTest.java
@@ -16,6 +16,7 @@
 public class MatrixTest
 {
     private static final double EQUALITY_TOLERANCE = 1.0e-9;
+    private static final double NEAR_SINGULAR_EQUALITY_TOLERANCE = 1.0e-6;
 
     //**************************************************************//
     //********************  Test Matrix Inversion  *****************//
@@ -113,7 +114,7 @@ public void testInverseOfNearSingular()
         assertNotNull("Matrix inverse is null", mInv);
 
         Matrix identity = m.multiply(mInv);
-        assertTrue("Matrix inverse is incorrect", equals(identity, Matrix.IDENTITY, EQUALITY_TOLERANCE));
+        assertTrue("Matrix inverse is incorrect", equals(identity, Matrix.IDENTITY, NEAR_SINGULAR_EQUALITY_TOLERANCE));
     }
 
     //**************************************************************//
@@ -122,13 +123,21 @@ public void testInverseOfNearSingular()
 
     private static boolean equals(Matrix a, Matrix b, double tolerance)
     {
-        return Math.abs(a.m11 - b.m11) < tolerance && Math.abs(a.m12 - b.m12) < tolerance
-            && Math.abs(a.m13 - b.m13) < tolerance && Math.abs(a.m14 - b.m14) < tolerance
-            && Math.abs(a.m21 - b.m21) < tolerance && Math.abs(a.m22 - b.m22) < tolerance
-            && Math.abs(a.m23 - b.m23) < tolerance && Math.abs(a.m24 - b.m24) < tolerance
-            && Math.abs(a.m31 - b.m31) < tolerance && Math.abs(a.m32 - b.m32) < tolerance
-            && Math.abs(a.m33 - b.m33) < tolerance && Math.abs(a.m34 - b.m34) < tolerance
-            && Math.abs(a.m41 - b.m41) < tolerance && Math.abs(a.m42 - b.m42) < tolerance
-            && Math.abs(a.m43 - b.m43) < tolerance && Math.abs(a.m44 - b.m44) < tolerance;
+        return Math.abs(a.m11 - b.m11) < tolerance
+            && Math.abs(a.m12 - b.m12) < tolerance
+            && Math.abs(a.m13 - b.m13) < tolerance
+            && Math.abs(a.m14 - b.m14) < tolerance
+            && Math.abs(a.m21 - b.m21) < tolerance
+            && Math.abs(a.m22 - b.m22) < tolerance
+            && Math.abs(a.m23 - b.m23) < tolerance
+            && Math.abs(a.m24 - b.m24) < tolerance
+            && Math.abs(a.m31 - b.m31) < tolerance
+            && Math.abs(a.m32 - b.m32) < tolerance
+            && Math.abs(a.m33 - b.m33) < tolerance
+            && Math.abs(a.m34 - b.m34) < tolerance
+            && Math.abs(a.m41 - b.m41) < tolerance
+            && Math.abs(a.m42 - b.m42) < tolerance
+            && Math.abs(a.m43 - b.m43) < tolerance
+            && Math.abs(a.m44 - b.m44) < tolerance;
     }
 }
diff --git a/test/gov/nasa/worldwind/ogc/kml/KMLExportTest.java b/test/gov/nasa/worldwind/ogc/kml/KMLExportTest.java
@@ -118,7 +118,7 @@ private boolean validateDocument(String doc)
 
             // Load the KML GX schema, which extends the OGC KML schema. This allows us to validate documents that use
             // the gx extensions.
-            Source schemaFile = new StreamSource(new File("schemas/kml22gx.xsd"));
+            Source schemaFile = new StreamSource(new File("testData/schemas/kml22gx.xsd"));
             Schema schema = factory.newSchema(schemaFile);
 
             Validator validator = schema.newValidator();

diff --git a/test/gov/nasa/worldwind/util/NetworkStatusTest.java b/test/gov/nasa/worldwind/util/NetworkStatusTest.java
@@ -47,13 +47,15 @@ public void testSetTryAgainInterval()
         assertEquals("Set try again interval test ", tai, interval);
     }
 
+    @Ignore
     @Test
     public void testNetworkAvailable()
     {
         boolean tf = this.netStat.isNetworkUnavailable();
         assertFalse("Network unavailable test ", tf);
     }
 
+    @Ignore
     @Test
     public void testWorldWindAvailable()
     {

diff --git a/schemas/atom-author-link.xsd → testData/schemas/atom-author-link.xsd b/schemas/atom-author-link.xsd → testData/schemas/atom-author-link.xsd
diff --git a/schemas/collada141.xsd → testData/schemas/collada141.xsd b/schemas/collada141.xsd → testData/schemas/collada141.xsd
diff --git a/schemas/kml22gx.xsd → testData/schemas/kml22gx.xsd b/schemas/kml22gx.xsd → testData/schemas/kml22gx.xsd
@@ -26,7 +26,7 @@
 
   <!-- Import the language we are extending: OGC KML 2.2 -->
   <import namespace="http://www.opengis.net/kml/2.2"
-    schemaLocation="http://schemas.opengis.net/kml/2.2.0/ogckml22.xsd"/>
+    schemaLocation="ogckml22.xsd"/>
 
    <!-- Simple types -->
   <simpleType name="altitudeModeEnumType">

diff --git a/schemas/ogckml22.xsd → testData/schemas/ogckml22.xsd b/schemas/ogckml22.xsd → testData/schemas/ogckml22.xsd
@@ -20,7 +20,7 @@
 
   <!-- import xAL:Address -->
   <import namespace="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"
-    schemaLocation="http://docs.oasis-open.org/election/external/xAL.xsd"/>
+    schemaLocation="xAL.xsd"/>
 
   <!-- KML field types (simple content) -->
 

diff --git a/schemas/xAL.xsd → testData/schemas/xAL.xsd b/schemas/xAL.xsd → testData/schemas/xAL.xsd