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/08 09:21:16 UTC
[isis] branch master updated: ISIS-2571: 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
The following commit(s) were added to refs/heads/master by this push:
new f742ec9 ISIS-2571: test fixes
f742ec9 is described below
commit f742ec9efa19d6d6ca8c501735f4a4e938074728
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 8 10:20:46 2021 +0100
ISIS-2571: test fixes
---
.../services/appfeat/ApplicationFeatureIdTest.java | 4 ++--
.../services/appfeat/ApplicationFeatureTypeTest.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index f73fd05..abfd2d0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -306,14 +306,14 @@ public class ApplicationFeatureIdTest {
@Test
public void givenClassInRootPackage() throws Exception {
// given
- val applicationFeatureId = ApplicationFeatureId.newType("Bar");
+ val applicationFeatureId = ApplicationFeatureId.newType("x.Bar");
// when
val parentPackageId = applicationFeatureId.getParentNamespaceFeatureId();
// then
assertThat(parentPackageId.getSort(), is(ApplicationFeatureSort.NAMESPACE));
- assertThat(parentPackageId.getNamespace(), is(""));
+ assertThat(parentPackageId.getNamespace(), is("x"));
assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
assertThat(parentPackageId.getMemberName(), is(nullValue()));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
index bf237a1..9c060f9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
@@ -107,12 +107,12 @@ public class ApplicationFeatureTypeTest {
@Test
public void whenClass() throws Exception {
expectedException.expect(IllegalStateException.class);
- _Asserts.ensureNamespace(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "xxx"));
+ _Asserts.ensureNamespace(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "x.xxx"));
}
@Test
public void whenMember() throws Exception {
expectedException.expect(IllegalStateException.class);
- _Asserts.ensureNamespace(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "xxx#x"));
+ _Asserts.ensureNamespace(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "x.xxx#x"));
}
}
@@ -127,12 +127,12 @@ public class ApplicationFeatureTypeTest {
}
@Test
public void whenClass() throws Exception {
- _Asserts.ensureNamespaceOrType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "xxx"));
+ _Asserts.ensureNamespaceOrType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "x.xxx"));
}
@Test
public void whenMember() throws Exception {
expectedException.expect(IllegalStateException.class);
- _Asserts.ensureNamespaceOrType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "xxx#x"));
+ _Asserts.ensureNamespaceOrType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "x.xxx#x"));
}
}
@@ -148,12 +148,12 @@ public class ApplicationFeatureTypeTest {
}
@Test
public void whenClass() throws Exception {
- _Asserts.ensureType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "xxx"));
+ _Asserts.ensureType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "x.xxx"));
}
@Test
public void whenMember() throws Exception {
expectedException.expect(IllegalStateException.class);
- _Asserts.ensureType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "xxx#x"));
+ _Asserts.ensureType(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "x.xxx#x"));
}
}
@@ -170,11 +170,11 @@ public class ApplicationFeatureTypeTest {
@Test
public void whenClass() throws Exception {
expectedException.expect(IllegalStateException.class);
- _Asserts.ensureMember(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "xxx"));
+ _Asserts.ensureMember(ApplicationFeatureId.newFeature(ApplicationFeatureSort.TYPE, "x.xxx"));
}
@Test
public void whenMember() throws Exception {
- _Asserts.ensureMember(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "xxx#x"));
+ _Asserts.ensureMember(ApplicationFeatureId.newFeature(ApplicationFeatureSort.MEMBER, "x.xxx#x"));
}
}