polishing tests

Author: zak905

src/test/java/com/gwidgets/leaflet/test/EventTest.java

@@ -40,7 +40,7 @@ public JavaScriptObject call(JavaScriptObject event) {
 				div.id = "test9";
 				Document.getBody().appendChild(div);
 
-				 MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12, 7).maxZoom(20).build();
+				 MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12.0, 7.0).maxZoom(20.0).build();
 				Map map = L.map("test9", options);
 
 				map.on(EventTypes.MapEvents.LOAD, (e) -> {

src/test/java/com/gwidgets/leaflet/test/GwtyLeafletTestSuite.java

@@ -10,15 +10,14 @@ public class GwtyLeafletTestSuite extends GWTTestSuite {
 	 public static TestSuite suite() {
 	        TestSuite suite = new TestSuite("gwty-leaflet tests");
          	 suite.addTestSuite(MapTest.class); 
-//        	 suite.addTestSuite(MarkerTest.class);
-//	         suite.addTestSuite(PathTest.class);
-//	         suite.addTestSuite(VersionTest.class);
-//	         suite.addTestSuite(TransformationTest.class);
-//	         suite.addTestSuite(EventTest.class);
-//	         suite.addTestSuite(CRSTest.class);
-//             suite.addTestSuite(ProjectionTest.class);
+        	 suite.addTestSuite(MarkerTest.class);
+	         suite.addTestSuite(PathTest.class);
+	         suite.addTestSuite(VersionTest.class);
+	         suite.addTestSuite(TransformationTest.class);
+	         suite.addTestSuite(EventTest.class);
+	         suite.addTestSuite(CRSTest.class);
+             suite.addTestSuite(ProjectionTest.class);
 
 	        return suite;
 	 }
-	 
 }

src/test/java/com/gwidgets/leaflet/test/MapTest.java

@@ -40,23 +40,23 @@ public JavaScriptObject call(JavaScriptObject event) {
 		});
 	}
 
-//	public void testMapRemove(){
-//		InjectedLeafletResources.whenReady(new Function(){
-//			public JavaScriptObject call(JavaScriptObject event) {
-//				 HTMLElement div = Document.createElement("div");
-//				    div.id = "test5";
-//				    Document.getBody().appendChild(div);
-//				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12, 7).maxZoom(20).build();
-//					Map map = L.map("test5", options);
-//
-//					assertNotNull(map);
-//					map.remove();
-//				
-//					
-//					return null;
-//			}
-//		});
-//	}
+	public void testMapRemove(){
+		InjectedLeafletResources.whenReady(new Function(){
+			public JavaScriptObject call(JavaScriptObject event) {
+				 HTMLElement div = Document.createElement("div");
+				    div.id = "test5";
+				    Document.getBody().appendChild(div);
+				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12.0, 7.0).maxZoom(20.0).build();
+					Map map = L.map("test5", options);
+
+					assertNotNull(map);
+					map.remove();
+				
+					
+					return null;
+			}
+		});
+	}
 
 
 	public void testMapView(){
@@ -67,7 +67,7 @@ public JavaScriptObject call(JavaScriptObject event) {
 				    Document.getBody().appendChild(div);
 
 					Map map = L.map("test2", null);
-					map.setView(L.latLng(52.51, 13.40), 12, null);
+					map.setView(L.latLng(52.51, 13.40), 12.0, null);
 					assertNotNull(map);
 					assertEquals(map.getCenter().lat, 52.51);
 					assertEquals(map.getCenter().lng, 13.40);
@@ -85,21 +85,19 @@ public JavaScriptObject call(JavaScriptObject event) {
 				 HTMLElement div = Document.createElement("div");
 				    div.id = "test3";
 				    Document.getBody().appendChild(div);
-				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12, 7).dragging(true).maxZoom(20).build();
+				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12.0, 7.0).dragging(true).maxZoom(20.0).build();
 					Map map = L.map("test3", options);
-
+					
 					assertNotNull(map);
 					assertEquals(String.valueOf(map.getZoom()), "12");
 				    assertEquals(String.valueOf(map.getMinZoom()), "7");
      				assertEquals(String.valueOf(map.getMaxZoom()), "20");
 
-     				//Zoom In/Zoom Out has weird behavior *** Fails
+     				//Zoom In method has weird behavior *** Fails
+     				
 
-//     				map.zoomIn(3, null);
-//     				assertEquals(String.valueOf(map.getZoom()), "15");
-//     				
-//     				map.zoomOut(5, null);
-//     				assertEquals(String.valueOf(map.getMaxZoom()), "10");
+     				map.zoomOut(5.0, null);
+     				assertEquals("7", map.getZoom().toString());
 
 					return null;
 			}
@@ -112,7 +110,7 @@ public JavaScriptObject call(JavaScriptObject event) {
 				 HTMLElement div = Document.createElement("div");
 				    div.id = "test4";
 				    Document.getBody().appendChild(div);
-				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12, 7).maxZoom(20).build();
+				      MapOptions options = new MapOptions.Builder(L.latLng(52.51, 13.40), 12.0, 7.0).maxZoom(20.0).build();
 					Map map = L.map("test4", options);
 
 					assertNotNull(map);

src/test/java/com/gwidgets/leaflet/test/TransformationTest.java

@@ -9,7 +9,7 @@
 public class TransformationTest extends GwtyLeafletTestCase {
 
 
-	/******* test fails *********/
+	/******* test fails for equal method *********/
 
 	public void testTransformation(){
 		InjectedLeafletResources.whenReady(new Function(){
@@ -22,9 +22,11 @@ public JavaScriptObject call(JavaScriptObject event) {
 				   Point untransformed = trans.untransform(transformed, 1);
 
 				   assertEquals(testpoint.toString(), untransformed.toString());
+				   assertEquals(String.valueOf(testpoint.x), String.valueOf(untransformed.x));
+				   assertEquals(String.valueOf(testpoint.y), String.valueOf(untransformed.y));
 				 //  assertTrue(untransformed.equals(testpoint));
 
-					
+
 					return null;
 			}
 		});