You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/03/02 07:17:15 UTC
[isis] 07/11: ISIS-2553: test fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a82d59bf77238369f3c676832f8b5cb17eefd064
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 1 20:02:31 2021 +0100
ISIS-2553: test fixes
---
.../object/domainobject/DomainObjectAnnotationFacetFactoryTest.java | 3 +--
.../object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java | 3 +--
.../objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java | 3 +--
.../discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index a2246a7..b83261b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -34,7 +34,6 @@ import static org.junit.Assert.assertFalse;
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.commons.having.HasUniqueId;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
@@ -560,7 +559,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
final ObjectSpecIdFacetForDomainObjectAnnotation facetForDomainObjectAnnotation =
(ObjectSpecIdFacetForDomainObjectAnnotation) facet;
- assertThat(facetForDomainObjectAnnotation.value(), is(ObjectSpecId.of("CUS")));
+ assertThat(facetForDomainObjectAnnotation.value(), is("CUS"));
expectNoMethodsRemoved();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
index 8c6a3b6..3b50a6c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
@@ -58,7 +57,7 @@ public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
assertThat(facet, is(not(nullValue())));
assertThat(facet instanceof ObjectSpecIdFacetForDomainObjectAnnotation, is(true));
- assertThat(facet.value(), is(ObjectSpecId.of("CUS")));
+ assertThat(facet.value(), is("CUS"));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 1445001..751f834 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName;
@@ -56,7 +55,7 @@ public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFa
assertThat(facet, is(not(nullValue())));
assertThat(facet instanceof ObjectSpecIdFacetDerivedFromClassName, is(true));
- assertThat(facet.value(), is(ObjectSpecId.of(Customer.class.getCanonicalName())));
+ assertThat(facet.value(), is(Customer.class.getCanonicalName()));
}
}
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
index f2dd166..4dd4fbd 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
@@ -21,7 +21,6 @@ package org.apache.isis.persistence.jdo.metamodel.facets.object.discriminator;
import javax.jdo.annotations.Discriminator;
import javax.jdo.annotations.PersistenceCapable;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory;
@@ -102,7 +101,7 @@ public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFac
facetFactory.process(new ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext(Customer.class, facetHolder));
final ObjectSpecIdFacet discriminatorValueFacet = facetHolder.getFacet(ObjectSpecIdFacet.class);
- assertEquals(ObjectSpecId.of("CUS"), discriminatorValueFacet.value());
+ assertEquals("CUS", discriminatorValueFacet.value());
}
public void testNoMethodsRemoved() {