Commit 71d1f777 authored by Robert Smith's avatar Robert Smith
Browse files

Updated tests



Updated test for the refactored visualization services.
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 4d12264a
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -34,6 +34,7 @@ Import-Package: com.jme3.app,
org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.geometry.widgets,
org.eclipse.ice.viz.service.internal,
org.eclipse.ice.viz.service.javafx.mesh,
org.eclipse.ice.viz.service.jme3.mesh,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.mesh.javafx,
......
......@@ -18,6 +18,8 @@ import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.viz.service.IVizCanvas;
import org.eclipse.ice.viz.service.IVizService;
import org.eclipse.ice.viz.service.IVizServiceFactory;
import org.eclipse.ice.viz.service.geometry.widgets.ShapeTreeView;
import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
......
......@@ -20,9 +20,10 @@ import org.eclipse.ice.client.common.ActionTree;
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.viz.service.IVizService;
import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.viz.service.javafx.mesh.FXMeshVizService;
import org.eclipse.ice.viz.service.jme3.mesh.IMeshSelectionListener;
import org.eclipse.ice.viz.service.mesh.datastructures.IMeshVizCanvas;
import org.eclipse.ice.viz.service.mesh.javafx.FXMeshVizService;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.ToolBarManager;
......
......@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -9,7 +9,9 @@ Import-Package: org.eclipse.ice.datastructures.ICEObject,
org.eclipse.ice.datastructures.form,
org.eclipse.ice.item,
org.eclipse.ice.item.jobLauncher,
org.eclipse.ice.viz.service.datastructures
org.eclipse.ice.viz.service.datastructures,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.modeling
Require-Bundle: org.junit;bundle-version="4.8.2",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ice.item;bundle-version="2.0.0",
......
......@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -4,37 +4,41 @@ Bundle-Name: Geometry Visualization Service Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.geometry;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/ControllerFactory.xml,
OSGI-INF/vizGeometryService.xml
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
Bundle-Vendor: Oak Ridge National Laboratory
Import-Package: com.jme3.app,
com.jme3.asset,
com.jme3.app.state,
com.jme3.bullet,
com.jme3.bullet.collision.shapes,
com.jme3.bullet.control,
com.jme3.bullet.objects,
com.jme3.collision,
com.jme3.export,
com.jme3.font,
com.jme3.input,
com.jme3.light,
com.jme3.input.controls,
com.jme3.material,
com.jme3.math,
com.jme3.renderer,
com.jme3.renderer.queue,
com.jme3.scene,
com.jme3.scene.mesh,
com.jme3.scene.debug,
com.jme3.scene.shape,
com.jme3.system,
com.jme3.system.awt,
com.jme3.util,
gov.lbnl.visit.swt,
gov.lbnl.visit.swt.widgets,
javafx.embed.swt;version="2.2.0",
org.eclipse.core.internal.resources,
org.eclipse.draw2d.graph,
org.eclipse.e4.ui.workbench.modeling,
org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.datastructures,
org.eclipse.ice.viz.service.datastructures.VizObject,
org.eclipse.ice.viz.service.modeling,
org.eclipse.jface.databinding.swt,
org.slf4j;version="1.7.2",
visit.java.client
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
Bundle-Vendor: Oak Ridge National Laboratory
Eclipse-ExtensibleAPI: true
org.eclipse.ui,
org.eclipse.ui.views.properties,
org.eclipse.ui.views.properties.tabbed,
org.slf4j;version="1.7.2"
Export-Package: org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.geometry.widgets
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry excluding="org/eclipse/ice/viz/service/geometry/shapes/Tube.java|org/eclipse/ice/viz/service/geometry/widgets/RenderShape.java" kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry excluding="org/eclipse/ice/viz/service/geometry/shapes/Tube.java|org/eclipse/ice/viz/service/geometry/widgets/RenderShape.java" kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Geometry Visualization Service Plugin
Bundle-Name: JavaFX Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
......@@ -17,5 +17,7 @@ Import-Package: org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.mesh.properties,
org.eclipse.ice.viz.service.modeling
Export-Package: org.eclipse.ice.viz.service.javafx.geometry.datatypes
Export-Package: org.eclipse.ice.viz.service.javafx.geometry.datatypes,
org.eclipse.ice.viz.service.javafx.mesh,
org.eclipse.ice.viz.service.javafx.mesh.datatypes
......@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.geometry;
import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.viz.service.javafx.canvas.AbstractAttachment;
import org.eclipse.ice.viz.service.javafx.canvas.AbstractViewer;
import org.eclipse.ice.viz.service.javafx.canvas.FXSelection;
......
......@@ -12,8 +12,6 @@ package org.eclipse.ice.viz.service.javafx.mesh;
import org.eclipse.ice.viz.service.javafx.canvas.AbstractViewer;
import org.eclipse.ice.viz.service.javafx.canvas.FXVizCanvas;
import org.eclipse.ice.viz.service.mesh.datastructures.IMeshVizCanvas;
import org.eclipse.ice.viz.service.mesh.properties.MeshSelection;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ice.viz.service.javafx.canvas.AbstractAttachment;
......
......@@ -10,14 +10,14 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.client.widgets.test.geometry;
package org.eclipse.ice.viz.service.jme3.geometry.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.geometry.widgets.ShapeTransient;
import org.eclipse.ice.viz.service.jme3.geometry.JME3Shape;
import org.eclipse.ice.viz.service.jme3.geometry.ShapeTransient;
import org.eclipse.ice.viz.service.modeling.AbstractView;
import org.eclipse.ice.viz.service.modeling.ShapeComponent;
import org.junit.Test;
......
......@@ -27,7 +27,6 @@ import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.ice.viz.service.geometry.shapes.OperatorType;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.geometry.widgets.ShapeTransient;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.Transformation;
import org.eclipse.swt.SWT;
......
......@@ -10,16 +10,12 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.viz.service.geometry.widgets;
package org.eclipse.ice.viz.service.jme3.geometry;
import java.io.IOException;
import org.eclipse.ice.viz.service.modeling.Shape;
import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter;
import com.jme3.export.Savable;
/**
* <p>
* Wrapper class for allowing an IShape to be stored in a JME3 Spatial as user
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ice.viz.service.mesh"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -7,6 +7,8 @@ Fragment-Host: org.eclipse.ice.viz.service.mesh
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit
Import-Package: org.apache.log4j,
org.eclipse.ice.viz.service.javafx.mesh,
org.eclipse.ice.viz.service.javafx.mesh.datatypes,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.visit
Bundle-Vendor: Oak Ridge National Laboratory
......
......@@ -13,8 +13,8 @@ package org.eclipse.ice.viz.service.mesh.datastructures.test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.eclipse.ice.viz.service.mesh.datastructures.FXEdge;
import org.eclipse.ice.viz.service.mesh.datastructures.FXMeshControllerFactory;
import org.eclipse.ice.viz.service.javafx.mesh.datatypes.FXEdge;
import org.eclipse.ice.viz.service.javafx.mesh.datatypes.FXMeshControllerFactory;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMeshComponent;
import org.eclipse.ice.viz.service.modeling.AbstractView;
......
......@@ -13,6 +13,7 @@ package org.eclipse.ice.viz.service.mesh.javafx;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.eclipse.ice.viz.service.javafx.mesh.AxisGridGizmo;
import org.junit.Test;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment