Skip to content

Commit

Permalink
Test to JUnit 5 and Annotation #24
Browse files Browse the repository at this point in the history 
Signed-off-by: Guido Grune <g.grune@datainmotion.com>
  • Loading branch information
@gg-dim
gg-dim committed Jan 22, 2024
1 parent 9c22799 commit 7847b54
Show file tree
Hide file tree
Showing 12 changed files with 4,031 additions and 4,188 deletions.
27 changes: 5 additions & 22 deletions org.gecko.emf.mongo.test/src/org/gecko/emf/mongo/tests/CustomArrayDataTypeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.gecko.emf.mongo.handlers.MongoResourceSetConfigurator;
import org.gecko.emf.osgi.ResourceSetFactory;
import org.gecko.emf.osgi.annotation.require.RequireEMF;
import org.gecko.emf.osgi.configurator.ResourceSetConfigurator;
import org.gecko.emf.osgi.constants.EMFNamespaces;
import org.gecko.emf.osgi.example.model.basic.BasicFactory;
import org.gecko.emf.osgi.example.model.basic.Geometry;
Expand Down Expand Up @@ -63,11 +60,9 @@
@WithFactoryConfiguration(name = "mongoDatabase", location = "?", factoryPid = "MongoDatabaseProvider", properties = {
@Property(key = "alias", value = "TestDB"), @Property(key = "database", value = "test") })
public class CustomArrayDataTypeTest extends MongoEMFSetting {

@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetConfigurator> configuratorAware;
@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetFactory> rsAware;

@InjectService(cardinality = 0, filter = "(&(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)("+EMFNamespaces.EMF_MODEL_NAME+"=collection))")
ServiceAware<ResourceSet> rsAware;

@BeforeEach
public void doBefore(@InjectBundleContext BundleContext ctx) {
Expand All @@ -82,13 +77,7 @@ public void doAfter() {
@Test
public void testSimpleArray() throws IOException, InvalidSyntaxException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> geoCollection = client.getDatabase("test").getCollection("Geometry");
Expand Down Expand Up @@ -146,13 +135,7 @@ public void testSimpleArray() throws IOException, InvalidSyntaxException, Interr

@Test
public void testMultiDimensionalArray() throws IOException, InvalidSyntaxException, InterruptedException {
ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> geoCollection = client.getDatabase("test").getCollection("Geometry");
Expand Down
51 changes: 8 additions & 43 deletions org.gecko.emf.mongo.test/src/org/gecko/emf/mongo/tests/MongoEnumIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.gecko.emf.mongo.Options;
import org.gecko.emf.mongo.handlers.MongoResourceSetConfigurator;
import org.gecko.emf.osgi.ResourceSetFactory;
import org.gecko.emf.osgi.annotation.require.RequireEMF;
import org.gecko.emf.osgi.configurator.ResourceSetConfigurator;
import org.gecko.emf.osgi.constants.EMFNamespaces;
import org.gecko.emf.osgi.example.model.basic.BasicFactory;
import org.gecko.emf.osgi.example.model.basic.BasicPackage;
Expand Down Expand Up @@ -74,10 +71,9 @@
@WithFactoryConfiguration(name = "mongoDatabase", location = "?", factoryPid = "MongoDatabaseProvider", properties = {
@Property(key = "alias", value = "TestDB"), @Property(key = "database", value = "test") })
public class MongoEnumIntegrationTest extends MongoEMFSetting {
@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetConfigurator> configuratorAware;
@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetFactory> rsAware;

@InjectService(cardinality = 0, filter = "(&(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)("+EMFNamespaces.EMF_MODEL_NAME+"=collection))")
ServiceAware<ResourceSet> rsAware;

@BeforeEach
public void doBefore(@InjectBundleContext BundleContext ctx) {
Expand All @@ -101,14 +97,7 @@ public void doAfter() {
@Test
public void testSaveEnumName_Default()
throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -187,13 +176,7 @@ public void testSaveEnumName_Default()
public void testSaveEnumLiteral()
throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -273,13 +256,7 @@ public void testSaveEnumLiteral()
public void testSaveEnumUnderScoreBug()
throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -364,13 +341,7 @@ public void testSaveEnumUnderScoreBug()
public void testSaveEnumLiteralLoadName()
throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -451,13 +422,7 @@ public void testSaveEnumLiteralLoadName()
public void testSaveEnumNameLoadLiteral()
throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down
46 changes: 7 additions & 39 deletions ...ko.emf.mongo.test/src/org/gecko/emf/mongo/tests/MongoExtendedMetadataIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.gecko.emf.mongo.Options;
import org.gecko.emf.mongo.handlers.MongoResourceSetConfigurator;
import org.gecko.emf.osgi.ResourceSetFactory;
import org.gecko.emf.osgi.annotation.require.RequireEMF;
import org.gecko.emf.osgi.configurator.ResourceSetConfigurator;
import org.gecko.emf.osgi.constants.EMFNamespaces;
import org.gecko.emf.osgi.example.model.basic.BasicFactory;
import org.gecko.emf.osgi.example.model.basic.BusinessPerson;
Expand Down Expand Up @@ -70,10 +67,9 @@
@WithFactoryConfiguration(name = "mongoDatabase", location = "?", factoryPid = "MongoDatabaseProvider", properties = {
@Property(key = "alias", value = "TestDB"), @Property(key = "database", value = "test") })
public class MongoExtendedMetadataIntegrationTest extends MongoEMFSetting {
@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetConfigurator> configuratorAware;
@InjectService(cardinality = 0, filter = "(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)")
ServiceAware<ResourceSetFactory> rsAware;

@InjectService(cardinality = 0, filter = "(&(" + EMFNamespaces.EMF_CONFIGURATOR_NAME + "=mongo)("+EMFNamespaces.EMF_MODEL_NAME+"=collection))")
ServiceAware<ResourceSet> rsAware;

@BeforeEach
public void doBefore(@InjectBundleContext BundleContext ctx) {
Expand All @@ -94,15 +90,7 @@ public void doAfter() {
*/
@Test
public void testSaveNoExtendedMetadataAttribute() throws BundleException, InvalidSyntaxException, IOException, InterruptedException {

ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();

ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -162,14 +150,7 @@ public void testSaveNoExtendedMetadataAttribute() throws BundleException, Invali
*/
@Test
public void testSaveExtendedMetadataAttribute() throws BundleException, InvalidSyntaxException, IOException, InterruptedException {
ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();

ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -232,13 +213,7 @@ public void testSaveExtendedMetadataAttribute() throws BundleException, InvalidS
@SuppressWarnings("unchecked")
@Test
public void testSaveNoExtendedMetadataReferences() throws BundleException, InvalidSyntaxException, IOException, InterruptedException {
ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();
ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down Expand Up @@ -314,14 +289,7 @@ public void testSaveNoExtendedMetadataReferences() throws BundleException, Inval
@SuppressWarnings("unchecked")
@Test
public void testSaveExtendedMetadataReference() throws BundleException, InvalidSyntaxException, IOException, InterruptedException {
ResourceSetConfigurator rsc = (ResourceSetConfigurator) configuratorAware.waitForService(2000l);
assertFalse(configuratorAware.isEmpty());
assertTrue(rsc instanceof MongoResourceSetConfigurator);

ResourceSetFactory rsf = (ResourceSetFactory) rsAware.waitForService(2000l);
assertFalse(rsAware.isEmpty());
ResourceSet resourceSet = rsf.createResourceSet();

ResourceSet resourceSet = rsAware.getService();

System.out.println("Dropping DB");
MongoCollection<Document> bpCollection = client.getDatabase("test").getCollection("BusinessPerson");
Expand Down
Loading

0 comments on commit 7847b54

Please sign in to comment.