[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7322] tests modified, removed unused methods
|
From: |
Petur Thorsteinsson |
|
Subject: |
[Fmsystem-commits] [7322] tests modified, removed unused methods |
|
Date: |
Sat, 28 May 2011 11:19:49 +0000 |
Revision: 7322
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7322
Author: peturbjorn
Date: 2011-05-28 11:19:48 +0000 (Sat, 28 May 2011)
Log Message:
-----------
tests modified, removed unused methods
Modified Paths:
--------------
thirdparty/BIM_converter/trunk/.project
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/WholeModelOutput.java
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Site.java
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/type/FurnishingType.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/IfcModelTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ProjectTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SiteTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SpaceTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ZoneTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/CoveringTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/DoorTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/FurnishingTest.java
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/WindowTest.java
Removed Paths:
-------------
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/SiteLoader.java
Modified: thirdparty/BIM_converter/trunk/.project
===================================================================
--- thirdparty/BIM_converter/trunk/.project 2011-05-27 14:13:18 UTC (rev
7321)
+++ thirdparty/BIM_converter/trunk/.project 2011-05-28 11:19:48 UTC (rev
7322)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ifc_converter</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ifc_converter</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Deleted:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/SiteLoader.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/SiteLoader.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/loader/SiteLoader.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -1,29 +0,0 @@
-package no.bimconverter.ifc.loader;
-
-import java.util.List;
-
-import no.bimconverter.ifc.IfcSdaiException;
-import no.bimconverter.ifc.v2x3.object.Site;
-
-import jsdai.SIfc2x3.EIfcsite;
-import jsdai.lang.EEntity;
-import jsdai.lang.SdaiModel;
-
-
-public class SiteLoader extends CommonLoader{
- public SiteLoader() {
- }
-
- public Site loadModel(SdaiModel model) {
- List<EEntity> siteList = super.getEntitiesOfType(model,
EIfcsite.class);
- Site site = new Site();
- int siteListSize = siteList.size();
- if(siteListSize > 1) {
- throw new IfcSdaiException("Too many projects found!");
- } else if (siteListSize == 1) {
- EIfcsite siteEntity = (EIfcsite) siteList.get(0);
- site.load(siteEntity);
- }
- return site;
- }
-}
Modified:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/IfcModelImpl.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -21,9 +21,10 @@
import no.bimconverter.ifc.IfcSdaiException;
import no.bimconverter.ifc.RepositoriesImpl;
import no.bimconverter.ifc.loader.CommonLoader;
-import no.bimconverter.ifc.loader.SiteLoader;
import no.bimconverter.ifc.v2x3.object.Building;
import no.bimconverter.ifc.v2x3.object.BuildingStorey;
+import no.bimconverter.ifc.v2x3.object.CommonObject;
+import no.bimconverter.ifc.v2x3.object.FacilityManagementEntity;
import no.bimconverter.ifc.v2x3.object.Project;
import no.bimconverter.ifc.v2x3.object.Site;
import no.bimconverter.ifc.v2x3.object.Space;
@@ -46,16 +47,6 @@
private SdaiRepository repository;
private Project project = new Project();
private Site site = new Site();
- private List<Building> buildings = null;
- private List<BuildingStorey> buildingStoreys = null;
- private List<Space> spaces = null;
- private List<Covering> covering = null;
- private List<Window> windows = null;
- private List<Door> doors = null;
- private List<Furnishing> furnishingElements = null;
- private List<Zone> zones = null;
- private List<BuildingServiceElement> buildingServiceElements = null;
-
public IfcModelImpl() {
super();
}
@@ -207,24 +198,7 @@
makeModelReadable();
}
- public Project getProject() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- //this.project.loadModel(model);
- List<Project> pl = (List<Project>) (new
CommonLoader()).load(model, new Project());
-
- this.project = pl.get(0);
- return this.project;
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
+
public ModelInformation getExchangeFileProperties() {
super.openSdaiSession();
try {
@@ -241,188 +215,21 @@
return null;
}
-
- public Site getSite() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- SiteLoader siteLoader = new SiteLoader();
- this.site = siteLoader.loadModel(model);
- return this.site;
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<Building> getBuildings() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- //this.buildings = buildingLoader.loadBuildings(model);
- this.buildings = (List<Building>) (new
CommonLoader()).load(model, (new Building()));
- return this.buildings;
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<BuildingStorey> getBuildingStoreys() {
+ public List<? extends CommonObject>
getFacilityManagementEntity(FacilityManagementEntity facilityManagementEntity) {
super.openSdaiSession();
try {
makeModelAvailable();
-
-
- try {
- //this.buildingStoreys =
buildingStoreyLoader.loadBuildingStoreys(model);
- this.buildingStoreys = (List<BuildingStorey>)
(new CommonLoader()).load(model, (new BuildingStorey()));
- return this.buildingStoreys;
- } catch ( IfcSdaiException e) {
- return null;
- }
+ List<CommonObject> output = (List<CommonObject>) (new
CommonLoader()).load(model, facilityManagementEntity);
+ return output;
} catch (SdaiException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
+ throw new RuntimeException("Error loading
entity:"+facilityManagementEntity);
} finally {
super.closeSdaiSession();
}
-
- return null;
}
- public List<Space> getSpaces() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- try {
- //this.spaces = (List<Space>) (new
CommonLoader()).load(model, EIfcspace.class, Space.class);
- this.spaces = (List<Space>) (new
CommonLoader()).load(model, (new Space()));
- return this.spaces;
- } catch ( IfcSdaiException e) {
- return null;
- }
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<Covering> getCoverings() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- try {
- this.covering = (List<Covering>) (new
CommonLoader()).load(model, new Covering());
- return this.covering;
- } catch (IfcSdaiException e) {
-
- return null;
- }
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<Window> getWindows() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- try {
- this.windows = (List<Window>) (new
CommonLoader()).load(model, new Window());
- return this.windows;
- } catch (IfcSdaiException e) {
- logger.info("No windows found");
- return null;
- }
-
-
-
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<Door> getDoors() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
-
- try {
- this.doors = (List<Door>) (new
CommonLoader()).load(model, new Door());
- return this.doors;
- } catch (IfcSdaiException e) {
- logger.info("No doors found");
- return null;
- }
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<Zone> getZones() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
-
- try {
- this.zones = (List<Zone>) (new
CommonLoader()).load(model, new Zone());
- return this.zones;
- } catch (IfcSdaiException e) {
- logger.info("No zones found");
- return null;
- }
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
- public List<BuildingServiceElement> getBuildingServiceElement() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
-
- try {
- this.buildingServiceElements =
(List<BuildingServiceElement>) (new CommonLoader()).load(model, new
BuildingServiceElement());
- return this.buildingServiceElements;
- } catch (IfcSdaiException e) {
- logger.info("No buildingServiceElements found");
- return null;
- }
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
-
- return null;
- }
+
public SdaiModel getModel() {
return model;
}
@@ -431,26 +238,7 @@
this.model = model;
}
- public List<Furnishing> getFurnishing() {
- super.openSdaiSession();
- try {
- makeModelAvailable();
- try {
- this.furnishingElements = (List<Furnishing>)
(new CommonLoader()).load(model, new Furnishing());
- return this.furnishingElements;
- } catch (IfcSdaiException e) {
- logger.info("No furnishing found");
- return null;
- }
-
- } catch (SdaiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } finally {
- super.closeSdaiSession();
- }
- return null;
- }
+
}
Modified:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/WholeModelOutput.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/WholeModelOutput.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/WholeModelOutput.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -39,17 +39,17 @@
}
public void load(IfcModelImpl model) {
this.modelInformation = model.getExchangeFileProperties();
- this.project = model.getProject();
- this.site = model.getSite();
- this.buildings = model.getBuildings();
- this.buildingStoreys = model.getBuildingStoreys();
- this.spaces = model.getSpaces();
- this.covering = model.getCoverings();
- this.windows = model.getWindows();
- this.doors = model.getDoors();
- this.furnishingElements = model.getFurnishing();
- this.zones = model.getZones();
- this.buildingServiceElements =
model.getBuildingServiceElement();
+ this.project = ((List<Project>)
model.getFacilityManagementEntity(new Project())).get(0);
+ this.site = ((List<Site>) model.getFacilityManagementEntity(new
Site())).get(0);
+ this.buildings = (List<Building>)
model.getFacilityManagementEntity(new Building());
+ this.buildingStoreys = (List<BuildingStorey>)
model.getFacilityManagementEntity(new BuildingStorey());
+ this.spaces = (List<Space>)
model.getFacilityManagementEntity(new Space());
+ this.covering = (List<Covering>)
model.getFacilityManagementEntity(new Covering());
+ this.windows = (List<Window>)
model.getFacilityManagementEntity(new Window());
+ this.doors = (List<Door>) model.getFacilityManagementEntity(new
Door());
+ this.furnishingElements = (List<Furnishing>)
model.getFacilityManagementEntity(new Furnishing());
+ this.zones = (List<Zone>) model.getFacilityManagementEntity(new
Zone());
+ this.buildingServiceElements = (List<BuildingServiceElement>)
model.getFacilityManagementEntity(new BuildingServiceElement());
}
public ModelInformation getModelInformation() {
Modified:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Site.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Site.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/Site.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -15,19 +15,24 @@
import jsdai.SIfc2x3.EIfcpostaladdress;
import jsdai.SIfc2x3.EIfcroot;
import jsdai.SIfc2x3.EIfcsite;
+import jsdai.SIfc2x3.EIfcspace;
import jsdai.lang.EEntity;
import jsdai.lang.SdaiException;
import jsdai.lang.SdaiIterator;
@XmlRootElement
-public class Site extends SpatialStructure{
+public class Site extends SpatialStructure implements FacilityManagementEntity{
+ final static private Class<EIfcsite> ifcEntityType = EIfcsite.class;
final private static String commonPropertyName = "Pset_SiteCommon";
+ @Override
+ public Class<? extends EIfcobjectdefinition> getIfcEntityType() {
+ return ifcEntityType;
+ }
-
private Address address;
public Address getAddress() {
return address;
Modified:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/Furnishing.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -10,6 +10,7 @@
import jsdai.SIfc2x3.EIfcdoor;
import jsdai.SIfc2x3.EIfcelement;
import jsdai.SIfc2x3.EIfcfurnishingelement;
+import jsdai.SIfc2x3.EIfcfurnituretype;
import jsdai.SIfc2x3.EIfcobjectdefinition;
import jsdai.SIfc2x3.EIfcspace;
import jsdai.SIfc2x3.EIfctypeobject;
@@ -48,9 +49,9 @@
}
private void loadFurnishingType(EIfcfurnishingelement entity) throws
SdaiException {
EIfctypeobject typeObject = super.getTypeObject(entity);
- if(typeObject != null &&
typeObject.isKindOf(EIfcwindowstyle.class)) {
+ if(typeObject != null &&
typeObject.isKindOf(EIfcfurnituretype.class)) {
this.furnishingType = new FurnishingType();
- this.furnishingType.load((EIfcwindowstyle) typeObject);
+ this.furnishingType.load((EIfcfurnituretype)
typeObject);
}
}
Modified:
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/type/FurnishingType.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/type/FurnishingType.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/main/java/no/bimconverter/ifc/v2x3/object/element/type/FurnishingType.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -5,12 +5,13 @@
import no.bimconverter.ifc.v2x3.object.TypeObject;
import jsdai.SIfc2x3.EIfcdoorstyle;
+import jsdai.SIfc2x3.EIfcfurnituretype;
import jsdai.lang.SdaiException;
@XmlRootElement
public class FurnishingType extends TypeObject{
- public void load(EIfcdoorstyle entity) {
+ public void load(EIfcfurnituretype entity) {
try {
this.loadAttributes(entity);
this.loadClassification(entity);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/IfcModelTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/IfcModelTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/IfcModelTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -66,7 +66,7 @@
@Test
public void testCreateAndIntializeProjectObject() throws JAXBException {
- Project project = model.getProject();
+ Project project = ((List<Project>)
model.getFacilityManagementEntity(new Project())).get(0);
assertNotNull(project);
this.testGetProjectUnits(project);
this.testGetProjectAttributes(project);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingStoreyTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -39,7 +39,7 @@
@Before
public void setUp() {
super.createTestRepo();
- buildingStoreyList = model.getBuildingStoreys();
+ buildingStoreyList = (List<BuildingStorey>)
model.getFacilityManagementEntity(new BuildingStorey());
buildingStorey1 = buildingStoreyList.get(0);
buildingStorey2 = buildingStoreyList.get(1);
buildingStorey3 = buildingStoreyList.get(2);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/BuildingTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -42,7 +42,7 @@
@Before
public void setUp() {
super.createTestRepo();
- buildingsList = model.getBuildings();
+ buildingsList = (List<Building>)
model.getFacilityManagementEntity(new Building());
building = buildingsList.get(0);
}
@After
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ProjectTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ProjectTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ProjectTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -38,7 +38,7 @@
@Before
public void setUp() {
super.createTestRepo();
- project = model.getProject();
+ project = ((List<Project>)
model.getFacilityManagementEntity(new Project())).get(0);
}
@After
public void tearDown() {
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SiteTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SiteTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SiteTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -29,12 +29,18 @@
@Before
public void setUp() {
super.createTestRepo();
- site = model.getSite();
+ site = ((List<Site>) model.getFacilityManagementEntity(new
Site())).get(0);
+
}
@After
public void tearDown() {
}
+
@Test
+ public void checkSite() {
+ assertNotNull(site);
+ }
+ @Test
public void outputNewModel() throws SdaiException {
// Following line outputs IFC representation
//model.createNewMiniModel();
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SpaceTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SpaceTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/SpaceTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -51,7 +51,7 @@
@Before
public void setUp() {
super.createTestRepo();
- spaceList = model.getSpaces();
+ spaceList = (List<Space>) model.getFacilityManagementEntity(new
Space());
space1 = spaceList.get(0);
space2 = spaceList.get(1);
space3 = spaceList.get(2);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ZoneTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ZoneTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/ZoneTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -23,7 +23,7 @@
@Before
public void setUp() {
super.createTestRepo();
- zoneList = model.getZones();
+ zoneList = (List<Zone>) model.getFacilityManagementEntity(new
Zone());
zone1 = zoneList.get(0);
}
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/CoveringTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/CoveringTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/CoveringTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -46,7 +46,7 @@
@Before
public void setUp() {
super.createTestRepo();
- coverings = model.getCoverings();
+ coverings = (List<Covering>)
model.getFacilityManagementEntity(new Covering());
covering1 = coverings.get(0);
covering2 = coverings.get(1);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/DoorTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/DoorTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/DoorTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -70,7 +70,7 @@
@Before
public void setUp() {
super.createTestRepo();
- doors = model.getDoors();
+ doors = (List<Door>) model.getFacilityManagementEntity(new
Door());
door1 = doors.get(0);
door2 = doors.get(1);
door3 = doors.get(2);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/FurnishingTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/FurnishingTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/FurnishingTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -56,7 +56,7 @@
@Before
public void setUp() {
super.createTestRepo();
- furnishings = model.getFurnishing();
+ furnishings = (List<Furnishing>)
model.getFacilityManagementEntity(new Furnishing());
furnishing1 = furnishings.get(0);
furnishing2 = furnishings.get(1);
furnishing3 = furnishings.get(2);
Modified:
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/WindowTest.java
===================================================================
---
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/WindowTest.java
2011-05-27 14:13:18 UTC (rev 7321)
+++
thirdparty/BIM_converter/trunk/src/test/java/no/bimconverter/ifc/v2x3/object/element/WindowTest.java
2011-05-28 11:19:48 UTC (rev 7322)
@@ -60,7 +60,8 @@
@Before
public void setUp() {
super.createTestRepo();
- windows = model.getWindows();
+ //windows = model.getWindows();
+ windows =(List<Window>) model.getFacilityManagementEntity(new
Window());
window1 = windows.get(0);
window2 = windows.get(1);
window3 = windows.get(2);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7322] tests modified, removed unused methods,
Petur Thorsteinsson <=