Commit 1ec6d5a5 authored by iSergio's avatar iSergio
Browse files

Code refactoring

parent 11d8d7f9

cesiumjs4gwt-main/src/test/java/org/cesiumjs/cs/CesiumTest.java

+37 −37
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import org.cesiumjs.cs.core.providers.CesiumTerrainProvider; 
import org.cesiumjs.cs.promise.Fulfill;



/**

 * @author Serge Silaev aka iSergio <s.serge.b@gmail.com>

 * @author Serge Silaev aka iSergio

 */

public class CesiumTest extends BaseTestCase {

cesiumjs4gwt-main/src/test/java/org/cesiumjs/cs/CesiumTestSuite.java

+32 −29
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package org.cesiumjs.cs;



import com.google.gwt.junit.tools.GWTTestSuite;

import junit.framework.TestSuite;



import org.cesiumjs.cs.collections.ClippingPlaneCollectionTest;

import org.cesiumjs.cs.collections.LabelCollectionTest;

import org.cesiumjs.cs.core.Cartesian2Test;
@@ -28,8 +28,10 @@ import org.cesiumjs.cs.core.geometry.GroundPolylineGeometryTest; 
import org.cesiumjs.cs.scene.Cesium3DTilesetTest;

import org.cesiumjs.cs.scene.LabelTest;



import junit.framework.TestSuite;



/**

 * @author Serge Silaev aka iSergio <s.serge.b@gmail.com>

 * @author Serge Silaev aka iSergio

 */

public class CesiumTestSuite extends GWTTestSuite {

  public static TestSuite suite() {
@@ -54,7 +56,8 @@ public class CesiumTestSuite extends GWTTestSuite { 


    // Widgets

    // Not understand how test widgets, in this moment strange error

        // com.google.gwt.core.shared.SerializableThrowable: (InternalError) : TypeError: Cannot convert a Symbol value to a string

    // com.google.gwt.core.shared.SerializableThrowable: (InternalError) :

    // TypeError: Cannot convert a Symbol value to a string

    // suite.addTestSuite(ViewerPanelTest.class);



    return suite;

cesiumjs4gwt-main/src/test/java/org/cesiumjs/cs/collections/ClippingPlaneCollectionTest.java

+12 −12
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package org.cesiumjs.cs.collections; 
import org.cesiumjs.cs.BaseTestCase;



/**

 * @author Serge Silaev aka iSergio <s.serge.b@gmail.com>

 * @author Serge Silaev aka iSergio

 */

public class ClippingPlaneCollectionTest extends BaseTestCase {

cesiumjs4gwt-main/src/test/java/org/cesiumjs/cs/collections/DataSourceCollectionTest.java

+27 −25
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package org.cesiumjs.cs.collections;



import com.google.gwt.core.client.GWT;



import org.cesiumjs.cs.BaseTestCase;

import org.cesiumjs.cs.Cesium;

import org.cesiumjs.cs.datasources.DataSource;
@@ -25,7 +26,7 @@ import org.cesiumjs.cs.promise.Fulfill; 
import org.cesiumjs.cs.promise.Reject;



/**

 * @author Serge Silaev aka iSergio <s.serge.b@gmail.com>

 * @author Serge Silaev aka iSergio

 */

public class DataSourceCollectionTest extends BaseTestCase {

  private DataSourceCollection collection;
@@ -38,7 +39,8 @@ public class DataSourceCollectionTest extends BaseTestCase { 
    super.beginTest(new Test() {

      @Override

      public void execute() {

                GeoJsonDataSource.load(GWT.getModuleBaseURL() + "SampleData/simplestyles.geojson").then(new Fulfill<GeoJsonDataSource>() {

        GeoJsonDataSource.load(GWT.getModuleBaseURL() + "SampleData/simplestyles.geojson")

            .then(new Fulfill<GeoJsonDataSource>() {

              @Override

              public void onFulfilled(GeoJsonDataSource dataSource) {

                assertNotNull(dataSource);

cesiumjs4gwt-main/src/test/java/org/cesiumjs/cs/collections/LabelCollectionTest.java

+81 −81
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import org.cesiumjs.cs.scene.Label; 
import org.cesiumjs.cs.scene.options.LabelOptions;



/**

 * @author Serge Silaev aka iSergio <s.serge.b@gmail.com>

 * @author Serge Silaev aka iSergio

 */

public class LabelCollectionTest extends BaseTestCase {

  private static final String VALUE = "LABEL";