Changeset 3546 for print

Timestamp:

05/31/10 09:53:35 (2 years ago)

Author:

jeichar

Message:

Modified build so that building standalone jar will run tests before building jar.

Fixed tests on Transformer Test?

Location:

print/trunk

Files:

• build.gradle (modified) (2 diffs)
• src/test/java/org/mapfish/print/TransformerTest.java (modified) (2 diffs)

print/trunk/build.gradle

@@ -10 +10 @@
 apply plugin: 'eclipse'
 apply plugin: 'maven'
-apply plugin: ByteCodeQuality
 //usePlugin Cobertura
 
@@ -56 +55 @@
 }
 
-task standalone (dependsOn: compileJava, type: Jar) {
+task standalone (dependsOn: test, type: Jar) {
   baseName = "print-standalone"
 

print/trunk/src/test/java/org/mapfish/print/TransformerTest.java

@@ -44 +44 @@
                 int dpi = 2;
                 int scale = 10;
-                Transformer t = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, "epsg:4326");
-        assertEquals(100.0F, t.getPaperW());
-        assertEquals(70.0F, t.getPaperH());
+        Transformer geodetic = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, "EPSG:4326");
+        Transformer linear = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, null);
+        assertEquals(linear.getPaperW(), geodetic.getPaperW());
+        assertEquals(linear.getPaperH(), geodetic.getPaperH());
 
-        float pixelPerGeoUnit = (float) (unitEnum.convertTo(dpi, DistanceUnit.IN) / scale);
-        
-        assertFalse(pixelPerGeoUnit - t.getGeoH() < .000001);
+        assertTrue(Math.abs(linear.getGeoH() - geodetic.getGeoH()) > 0.00000001);
     }
     
@@ -58 +57 @@
                 int dpi = 2;
                 int scale = 10;
-                Transformer t = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, "EPSG:900913");
-        assertEquals(100.0F, t.getPaperW());
-        assertEquals(70.0F, t.getPaperH());
+        Transformer geodetic = new Transformer(731033.0f,5864001.0f, 100, 70, scale, dpi, unitEnum, 0, "EPSG:900913");
+        Transformer linear = new Transformer(6.566981170957462f, 46.51954387957121f, 100, 70, scale, dpi, unitEnum, 0, null);
+        assertEquals(linear.getPaperW(), geodetic.getPaperW());
+        assertEquals(linear.getPaperH(), geodetic.getPaperH());
 
-        float pixelPerGeoUnit = (float) (unitEnum.convertTo(dpi, DistanceUnit.IN) / scale);
+        assertTrue(Math.abs(linear.getGeoH() - geodetic.getGeoH()) > 0.00000001);
         
-        assertFalse(pixelPerGeoUnit - t.getGeoH() < .000001);
     }