You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/28 17:16:51 UTC
[48/56] [abbrv] ISIS-937: moved TCK out of core.
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
deleted file mode 100644
index 53c18b7..0000000
--- a/component/viewer/wicket/tck/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <relativePath>../../../../core/tck/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.8.0-SNAPSHOT</version>
-
- <name>Isis Wicket Viewer TCK tests</name>
-
-
- <properties>
- <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>wicket-tck/</relativeUrl>
- <!-- until someone comes up with a better solution -->
- <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/wicket</distMgmtSiteUrl>
- </properties>
-
- <packaging>war</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck-dom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck-fixture</artifactId>
- </dependency>
-
- <!-- isis viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-impl</artifactId>
- <version>${isis-viewer-wicket.version}</version>
- </dependency>
-
- <!-- isis runtime -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- </dependency>
-
- <!-- to run using WebServer -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webserver</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/TckApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/TckApplication.java b/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/TckApplication.java
deleted file mode 100644
index a6f375a..0000000
--- a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/TckApplication.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package viewer.wicket.app;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-
-import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
-
-public class TckApplication extends IsisWicketApplication {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected Module newIsisWicketModule() {
- return Modules.override(super.newIsisWicketModule()).with(new AbstractModule() {
- @Override
- protected void configure() {
- // bindConstant().annotatedWith(ApplicationCssUrl.class).to("myapp.css");
- }
- });
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/application.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/application.css b/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/application.css
deleted file mode 100644
index a82d472..0000000
--- a/component/viewer/wicket/tck/src/main/java/viewer/wicket/app/application.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#header {
- background: url('images/banner.png') no-repeat scroll left center transparent;
-}
-div.entitySummary > label.entityTitle {
- color: maroon;
- font-size: xx-large;
- font-weight: bolder;
-}
-.ToDoItem-description .scalarName {
- color: maroon;
- font-weight: bolder;
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/resources/images/Default.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/resources/images/Default.png b/component/viewer/wicket/tck/src/main/resources/images/Default.png
deleted file mode 100644
index 8409e46..0000000
Binary files a/component/viewer/wicket/tck/src/main/resources/images/Default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
deleted file mode 100644
index b6f34f0..0000000
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
+++ /dev/null
@@ -1,63 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-isis.services.prefix = org.apache.isis.tck.objstore.dflt
-isis.services =\
- scalars.ApplibValuedEntityRepositoryDefault,\
- scalars.JdkValuedEntityRepositoryDefault,\
- scalars.PrimitiveValuedEntityRepositoryDefault,\
- scalars.WrapperValuedEntityRepositoryDefault, \
- simples.SimpleEntityRepositoryDefault,\
- assocs.ParentEntityRepositoryDefault
-
-isis.fixtures.prefix= org.apache.isis.tck.fixture
-isis.fixtures=\
- LogonAsSvenFixture,\
- scalars.ApplibValuedEntityFixture,\
- scalars.JdkValuedEntityFixture,\
- scalars.PrimitiveValuedEntityFixture,\
- scalars.WrapperValuedEntityFixture,\
- simples.SimpleEntityFixture,\
- assocs.ParentAndChildEntityFixture
-
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
-
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
-
-
-isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
-#isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
-
-
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-#isis.authorization.learn=true
-
-
-
-isis.persistor=in-memory
-#isis.xmlos.dir=/tmp/xml
-
-isis.authentication=bypass
-
-###############################
-# wicket-viewer specific
-###############################
-#isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionAnnotationFacetFactory
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/logging.properties b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index f2d65e6..0000000
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# apache's log4j is used to provide system logging.
-log4j.rootCategory=INFO, Console
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.allow
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.allow b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.allow
deleted file mode 100644
index 928983a..0000000
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.allow
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.passwords
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.passwords b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.passwords
deleted file mode 100644
index 7f07af5..0000000
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/security_file.passwords
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-sven:pass
-dick:pass
-bob:pass
-joe:pass
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/web.xml b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 27f24b4..0000000
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <display-name>claims</display-name>
-
- <filter>
- <filter-name>wicket.claims</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication</param-value>
- <!--
- <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
- <param-value>viewer.wicket.app.ToDoApplication</param-value>
- -->
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>wicket.claims</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
-</web-app>
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/images/banner.pdn
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/images/banner.pdn b/component/viewer/wicket/tck/src/main/webapp/images/banner.pdn
deleted file mode 100644
index 1836bf5..0000000
Binary files a/component/viewer/wicket/tck/src/main/webapp/images/banner.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/component/viewer/wicket/tck/src/main/webapp/images/banner.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/images/banner.png b/component/viewer/wicket/tck/src/main/webapp/images/banner.png
deleted file mode 100644
index 3461ffc..0000000
Binary files a/component/viewer/wicket/tck/src/main/webapp/images/banner.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 63dc02a..be411c8 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -94,11 +94,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck-dom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
deleted file mode 100644
index 0dc3c61..0000000
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport;
-
-import java.util.Arrays;
-import java.util.List;
-import com.google.common.collect.Lists;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures.Fixtures.Initialization;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.core.objectstore.InMemoryPersistenceMechanismInstaller;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
-import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.runtime.system.persistence.Persistor;
-import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-import org.apache.isis.core.runtime.system.transaction.IsisTransaction.State;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-import org.apache.isis.core.security.authentication.AuthenticationRequestNameOnly;
-import org.apache.isis.core.tck.dom.refs.*;
-import org.apache.isis.core.tck.dom.scalars.ApplibValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.JdkValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntity;
-
-/**
- * Wraps a plain {@link IsisSystemDefault}, and provides a number of features to assist with testing.
- *
- * <p>
- * TODO: need to make inherit from the {@link IsisSystemForTest}.
- */
-public class IsisSystemWithFixtures implements org.junit.rules.TestRule {
-
-
- public interface Listener {
-
- void init(IsisConfiguration configuration) throws Exception;
-
- void preSetupSystem(boolean firstTime) throws Exception;
- void postSetupSystem(boolean firstTime) throws Exception;
-
- void preBounceSystem() throws Exception;
- void postBounceSystem() throws Exception;
-
- void preTeardownSystem() throws Exception;
- void postTeardownSystem() throws Exception;
-
- }
-
- public static abstract class ListenerAdapter implements Listener {
-
- private IsisConfiguration configuration;
-
- public void init(IsisConfiguration configuration) throws Exception {
- this.configuration = configuration;
- }
-
- protected IsisConfiguration getConfiguration() {
- return configuration;
- }
-
- @Override
- public void preSetupSystem(boolean firstTime) throws Exception {
- }
-
- @Override
- public void postSetupSystem(boolean firstTime) throws Exception {
- }
-
- @Override
- public void preBounceSystem() throws Exception {
- }
-
- @Override
- public void postBounceSystem() throws Exception {
- }
-
- @Override
- public void preTeardownSystem() throws Exception {
- }
-
- @Override
- public void postTeardownSystem() throws Exception {
- }
-
- }
-
-
-
- /**
- * A precanned set of fixtures for use by tests if desired.
- */
- public static class Fixtures {
-
- public enum Initialization {
- INIT,
- NO_INIT
- }
-
- public ParentEntityRepository associatedEntitiesRepository = new ParentEntityRepository();
-
- public ApplibValuedEntity ave1, ave2;
- public JdkValuedEntity jve1, jve2;
- public PrimitiveValuedEntity pve1, pve2;
- public WrapperValuedEntity wve1, wve2;
-
- public SimpleEntity smpl1, smpl2, smpl3, smpl4, smpl5, smpl6;
- public ReferencingEntity rfcg1, rfcg2, rfcg3, rfcg4, rfcg5, rfcg6;
- public ParentEntity prnt1, prnt2, prnt3, prnt4, prnt5, prnt6;
- public AggregatedEntity rfcg1_a1, rfcg1_a2, rfcg1_a3, prnt1_a1, prnt1_a2, prnt1_a3;
-
- private void init(DomainObjectContainer container) {
- ave1 = container.newTransientInstance(ApplibValuedEntity.class);
- ave2 = container.newTransientInstance(ApplibValuedEntity.class);
-
- jve1 = container.newTransientInstance(JdkValuedEntity.class);
- jve2 = container.newTransientInstance(JdkValuedEntity.class);
-
- pve1 = container.newTransientInstance(PrimitiveValuedEntity.class);
- pve2 = container.newTransientInstance(PrimitiveValuedEntity.class);
-
- wve1 = container.newTransientInstance(WrapperValuedEntity.class);
- wve2 = container.newTransientInstance(WrapperValuedEntity.class);
-
- smpl1 = container.newTransientInstance(SimpleEntity.class);smpl1.setName("1");
- smpl2 = container.newTransientInstance(SimpleEntity.class);smpl2.setName("2");
- smpl3 = container.newTransientInstance(SimpleEntity.class);smpl3.setName("3");
- smpl4 = container.newTransientInstance(SimpleEntity.class);smpl4.setName("4");
- smpl5 = container.newTransientInstance(SimpleEntity.class);smpl5.setName("5");
- smpl6 = container.newTransientInstance(SimpleEntity.class);smpl6.setName("6");
- rfcg1 = container.newTransientInstance(ReferencingEntity.class);
- rfcg2 = container.newTransientInstance(ReferencingEntity.class);
- rfcg3 = container.newTransientInstance(ReferencingEntity.class);
- rfcg4 = container.newTransientInstance(ReferencingEntity.class);
- rfcg5 = container.newTransientInstance(ReferencingEntity.class);
- rfcg6 = container.newTransientInstance(ReferencingEntity.class);
- prnt1 = container.newTransientInstance(ParentEntity.class);
- prnt2 = container.newTransientInstance(ParentEntity.class);
- prnt3 = container.newTransientInstance(ParentEntity.class);
- prnt4 = container.newTransientInstance(ParentEntity.class);
- prnt5 = container.newTransientInstance(ParentEntity.class);
- prnt6 = container.newTransientInstance(ParentEntity.class);
- rfcg1_a1 = container.newAggregatedInstance(rfcg1, AggregatedEntity.class);
- rfcg1_a2 = container.newAggregatedInstance(rfcg1, AggregatedEntity.class);
- rfcg1_a3 = container.newAggregatedInstance(rfcg1, AggregatedEntity.class);
- prnt1_a1 = container.newAggregatedInstance(prnt1, AggregatedEntity.class);
- prnt1_a2 = container.newAggregatedInstance(prnt1, AggregatedEntity.class);
- prnt1_a3 = container.newAggregatedInstance(prnt1, AggregatedEntity.class);
- }
- }
-
- private IsisSystemDefault isisSystem;
- private AuthenticationSession authenticationSession;
-
- // public visibility just to reduce noise in tests
- public DomainObjectContainer container;
- // public visibility just to reduce noise in tests
- public final Fixtures fixtures;
-
- private Initialization fixturesInitialization;
- private final IsisConfiguration configuration;
- private final PersistenceMechanismInstaller persistenceMechanismInstaller;
- private final AuthenticationRequest authenticationRequest;
- private final List<Object> services;
- private List <Listener> listeners;
- private final MetaModelValidator metaModelValidator;
- private final ProgrammingModel programmingModel;
-
-
- ////////////////////////////////////////////////////////////
- // constructor
- ////////////////////////////////////////////////////////////
-
- public static class Builder {
-
- private AuthenticationRequest authenticationRequest = new AuthenticationRequestNameOnly("tester");
-
- private Initialization fixturesInitialization = Initialization.INIT;
- private IsisConfiguration configuration;
- private PersistenceMechanismInstaller persistenceMechanismInstaller = new InMemoryPersistenceMechanismInstaller();
- private MetaModelValidator metaModelValidator;
- private ProgrammingModel programmingModel;
-
- private final List <Listener> listeners = Lists.newArrayList();
- private final List<Object> services = Lists.newArrayList();
-
- public Builder() {
- withServices(new DomainObjectContainerDefault());
- }
-
- public Builder with(IsisConfiguration configuration) {
- this.configuration = configuration;
- return this;
- }
-
- public Builder with(Initialization initialization) {
- this.fixturesInitialization = initialization;
- return this;
- }
-
- public Builder with(PersistenceMechanismInstaller persistenceMechanismInstaller) {
- this.persistenceMechanismInstaller = persistenceMechanismInstaller;
- return this;
- }
-
- public Builder with(AuthenticationRequest authenticationRequest) {
- this.authenticationRequest = authenticationRequest;
- return this;
- }
-
- public Builder withServices(Object... services) {
- this.services.addAll(0, Arrays.asList(services));
- return this;
- }
-
- public IsisSystemWithFixtures build() {
- return new IsisSystemWithFixtures(fixturesInitialization, configuration, programmingModel, metaModelValidator, persistenceMechanismInstaller, authenticationRequest, services, listeners);
- }
-
- public Builder with(Listener listener) {
- if(listener != null) {
- listeners.add(listener);
- }
- return this;
- }
-
- public Builder with(MetaModelValidator metaModelValidator) {
- this.metaModelValidator = metaModelValidator;
- return this;
- }
-
- public Builder with(ProgrammingModel programmingModel) {
- this.programmingModel = programmingModel;
- return this;
- }
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- private IsisSystemWithFixtures(Initialization fixturesInitialization, IsisConfiguration configuration, ProgrammingModel programmingModel, MetaModelValidator metaModelValidator, PersistenceMechanismInstaller persistenceMechanismInstaller, AuthenticationRequest authenticationRequest, List<Object> services, List<Listener> listeners) {
- this.fixturesInitialization = fixturesInitialization;
- this.configuration = configuration;
- this.programmingModel = programmingModel;
- this.metaModelValidator = metaModelValidator;
- this.persistenceMechanismInstaller = persistenceMechanismInstaller;
- this.authenticationRequest = authenticationRequest;
- this.fixtures = new Fixtures();
-
- // hacky
- services.add(fixtures.associatedEntitiesRepository);
- this.services = services;
-
- this.listeners = listeners;
-
- this.container = lookupContainer();
- }
-
-
- ////////////////////////////////////////////////////////////
- // setup, teardown
- ////////////////////////////////////////////////////////////
-
-
- /**
- * Intended to be called from a test's {@link Before} method.
- */
- public void setUpSystem() throws Exception {
- setUpSystem(FireListeners.FIRE);
- }
-
- private void setUpSystem(FireListeners fireListeners) throws Exception {
- org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-
- boolean firstTime = isisSystem == null;
- if (fireListeners.shouldFire()) {
- fireInitAndPreSetupSystem(firstTime);
- }
-
- if (firstTime) {
- isisSystem = createIsisSystem(services);
- isisSystem.init();
- IsisContext.closeSession();
- }
-
- final AuthenticationManager authenticationManager = isisSystem.getSessionFactory().getAuthenticationManager();
- authenticationSession = authenticationManager.authenticate(authenticationRequest);
-
- IsisContext.openSession(authenticationSession);
-
- DomainObjectContainer container = lookupContainer();
- if (firstTime && fixturesInitialization == Fixtures.Initialization.INIT) {
- fixtures.init(container);
- }
- if (fireListeners.shouldFire()) {
- firePostSetupSystem(firstTime);
- }
-
- }
-
- private DomainObjectContainer lookupContainer() {
- return lookupContainerIn(services);
- }
-
- private static DomainObjectContainer lookupContainerIn(List<Object> services1) {
- for (Object service : services1) {
- if(service instanceof DomainObjectContainer) {
- return (DomainObjectContainer) service;
- }
- }
- throw new IllegalStateException("Could not locate DomainObjectContainer");
- }
-
-
- private enum FireListeners {
- FIRE,
- DONT_FIRE;
- public boolean shouldFire() {
- return this == FIRE;
- }
- }
-
-
- /**
- * Intended to be called from a test's {@link After} method.
- */
- public void tearDownSystem() throws Exception {
- tearDownSystem(FireListeners.FIRE);
- }
-
- private void tearDownSystem(final FireListeners fireListeners) throws Exception {
- if(fireListeners.shouldFire()) {
- firePreTeardownSystem();
- }
- IsisContext.closeSession();
- if(fireListeners.shouldFire()) {
- firePostTeardownSystem();
- }
- }
-
- public void bounceSystem() throws Exception {
- firePreBounceSystem();
- tearDownSystem(FireListeners.DONT_FIRE);
- setUpSystem(FireListeners.DONT_FIRE);
- firePostBounceSystem();
- }
-
-
- private IsisSystemDefault createIsisSystem(List<Object> services) {
- final IsisSystemDefault system = new IsisSystemDefault(DeploymentType.UNIT_TESTING, services) {
- @Override
- public IsisConfiguration getConfiguration() {
- if(IsisSystemWithFixtures.this.configuration != null) {
- return IsisSystemWithFixtures.this.configuration;
- } else {
- return super.getConfiguration();
- }
- }
- @Override
- protected ProgrammingModel obtainReflectorProgrammingModel() {
- if(IsisSystemWithFixtures.this.programmingModel != null) {
- return IsisSystemWithFixtures.this.programmingModel;
- } else {
- return super.obtainReflectorProgrammingModel();
- }
- }
- @Override
- protected MetaModelValidator obtainReflectorMetaModelValidator() {
- if(IsisSystemWithFixtures.this.metaModelValidator != null) {
- return IsisSystemWithFixtures.this.metaModelValidator;
- } else {
- return super.obtainReflectorMetaModelValidator();
- }
- }
- @Override
- protected PersistenceMechanismInstaller obtainPersistenceMechanismInstaller(IsisConfiguration configuration) {
- final PersistenceMechanismInstaller installer = IsisSystemWithFixtures.this.persistenceMechanismInstaller;
- configuration.injectInto(installer);
- return installer;
- }
- };
- return system;
- }
-
-
-
- ////////////////////////////////////////////////////////////
- // listeners
- ////////////////////////////////////////////////////////////
-
- private void fireInitAndPreSetupSystem(boolean firstTime) throws Exception {
- if(firstTime) {
- for(Listener listener: listeners) {
- listener.init(configuration);
- }
- }
- for(Listener listener: listeners) {
- listener.preSetupSystem(firstTime);
- }
- }
-
- private void firePostSetupSystem(boolean firstTime) throws Exception {
- for(Listener listener: listeners) {
- listener.postSetupSystem(firstTime);
- }
- }
-
- private void firePreTeardownSystem() throws Exception {
- for(Listener listener: listeners) {
- listener.preTeardownSystem();
- }
- }
-
- private void firePostTeardownSystem() throws Exception {
- for(Listener listener: listeners) {
- listener.postTeardownSystem();
- }
- }
-
- private void firePreBounceSystem() throws Exception {
- for(Listener listener: listeners) {
- listener.preBounceSystem();
- }
- }
-
- private void firePostBounceSystem() throws Exception {
- for(Listener listener: listeners) {
- listener.postBounceSystem();
- }
- }
-
-
- ////////////////////////////////////////////////////////////
- // properties
- ////////////////////////////////////////////////////////////
-
- /**
- * The {@link IsisSystemDefault} created during {@link #setUpSystem()}.
- */
- public IsisSystemDefault getIsisSystem() {
- return isisSystem;
- }
-
- /**
- * The {@link AuthenticationSession} created during {@link #setUpSystem()}.
- */
- public AuthenticationSession getAuthenticationSession() {
- return authenticationSession;
- }
-
-
-
- ////////////////////////////////////////////////////////////
- // Convenience for tests
- ////////////////////////////////////////////////////////////
-
- public ObjectSpecification loadSpecification(Class<?> cls) {
- return getIsisSystem().getSessionFactory().getSpecificationLoader().loadSpecification(cls);
- }
-
- public ObjectAdapter persist(Object domainObject) {
- ensureSessionInProgress();
- ensureObjectIsNotPersistent(domainObject);
- container.persist(domainObject);
- return adapterFor(domainObject);
- }
-
- public ObjectAdapter destroy(Object domainObject ) {
- ensureSessionInProgress();
- ensureObjectIsPersistent(domainObject);
- container.remove(domainObject);
- return adapterFor(domainObject);
- }
-
- public ObjectAdapter adapterFor(Object domainObject) {
- ensureSessionInProgress();
- return getAdapterManager().adapterFor(domainObject);
- }
-
- public ObjectAdapter reload(RootOid oid) {
- ensureSessionInProgress();
- final Persistor persistenceSession = getPersistenceSession();
- return persistenceSession.loadObject(oid);
- }
-
- public ObjectAdapter recreateAdapter(RootOid oid) {
- ensureSessionInProgress();
- return getAdapterManager().adapterFor(oid);
- }
-
- public ObjectAdapter remapAsPersistent(Object pojo, RootOid persistentOid) {
- ensureSessionInProgress();
- ensureObjectIsNotPersistent(pojo);
- final ObjectAdapter adapter = adapterFor(pojo);
- getPersistenceSession().remapAsPersistent(adapter, persistentOid);
- return adapter;
- }
-
- @SuppressWarnings("unchecked")
- public <T extends ObjectStoreSpi> T getObjectStore(Class<T> cls) {
- final PersistenceSession persistenceSession = getPersistenceSession();
- return (T) persistenceSession.getObjectStore();
- }
-
- private static void ensureSessionInProgress() {
- if(!IsisContext.inSession()) {
- throw new IllegalStateException("Session must be in progress");
- }
- }
-
- private void ensureObjectIsNotPersistent(Object domainObject) {
- if(container.isPersistent(domainObject)) {
- throw new IllegalArgumentException("domain object is already persistent");
- }
- }
-
- private void ensureObjectIsPersistent(Object domainObject) {
- if(!container.isPersistent(domainObject)) {
- throw new IllegalArgumentException("domain object is not persistent");
- }
- }
-
- ////////////////////////////////////////////////////////////
- // JUnit @Rule integration
- ////////////////////////////////////////////////////////////
-
- @Override
- public Statement apply(final Statement base, Description description) {
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- setUpSystem();
- try {
- base.evaluate();
- tearDownSystem();
- } catch(Throwable ex) {
- try {
- tearDownSystem();
- } catch(Exception ex2) {
- // ignore, since already one pending
- }
- throw ex;
- }
- }
- };
- }
-
-
-
- public void beginTran() {
- final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
-
- if(transaction == null) {
- transactionManager.startTransaction();
- return;
- }
-
- final State state = transaction.getState();
- switch(state) {
- case COMMITTED:
- case ABORTED:
- transactionManager.startTransaction();
- break;
- case IN_PROGRESS:
- // nothing to do
- break;
- case MUST_ABORT:
- Assert.fail("Transaction is in state of '" + state + "'");
- break;
- default:
- Assert.fail("Unknown transaction state '" + state + "'");
- }
-
- }
-
- public void commitTran() {
- final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
- if(transaction == null) {
- Assert.fail("No transaction exists");
- return;
- }
- final State state = transaction.getState();
- switch(state) {
- case COMMITTED:
- case ABORTED:
- case MUST_ABORT:
- Assert.fail("Transaction is in state of '" + state + "'");
- break;
- case IN_PROGRESS:
- transactionManager.endTransaction();
- break;
- default:
- Assert.fail("Unknown transaction state '" + state + "'");
- }
- }
-
- public void abortTran() {
- final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
- if(transaction == null) {
- Assert.fail("No transaction exists");
- return;
- }
- final State state = transaction.getState();
- switch(state) {
- case ABORTED:
- break;
- case COMMITTED:
- Assert.fail("Transaction is in state of '" + state + "'");
- break;
- case MUST_ABORT:
- case IN_PROGRESS:
- transactionManager.abortTransaction();
- break;
- default:
- Assert.fail("Unknown transaction state '" + state + "'");
- }
- }
-
- protected IsisTransactionManager getTransactionManager() {
- return getPersistenceSession().getTransactionManager();
- }
-
- public Persistor getPersistor() {
- return getPersistenceSession();
- }
-
- public AdapterManager getAdapterManager() {
- return getPersistor().getAdapterManager();
- }
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/tck/ObjectStoreContractTest_persist.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/tck/ObjectStoreContractTest_persist.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/tck/ObjectStoreContractTest_persist.java
deleted file mode 100644
index a158b20..0000000
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/tck/ObjectStoreContractTest_persist.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport.tck;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
-import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
-import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-
-public abstract class ObjectStoreContractTest_persist {
-
- @Rule
- public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder()
- .with(createPersistenceMechanismInstaller())
- .with(iswfListener()).build();
-
-
- /**
- * Mandatory hook.
- */
- protected abstract PersistenceMechanismInstaller createPersistenceMechanismInstaller();
-
- protected IsisSystemWithFixtures.Listener iswfListener() {
- return null;
- }
-
- /**
- * hook method
- */
- protected void resetPersistenceStore() {
- }
-
- protected ObjectAdapter epv2Adapter;
- protected ObjectSpecification epvSpecification;
-
- protected ObjectStoreSpi getStore() {
- PersistenceSession psos = IsisContext.getPersistenceSession();
- return (ObjectStoreSpi) psos.getObjectStore();
- }
-
-
- @Before
- public void setUpFixtures() throws Exception {
- epv2Adapter = iswf.adapterFor(iswf.fixtures.smpl2);
- epvSpecification = iswf.loadSpecification(SimpleEntity.class);
- }
-
-
- @Test
- public void getInstances_usingFindByTitle() throws Exception {
-
- // given nothing in DB
- resetPersistenceStore();
-
- // when search for any object
- boolean hasInstances = getStore().hasInstances(epvSpecification);
-
- // then find none
- assertFalse(hasInstances);
-
- // given now persisted
- final SimpleEntity epv2 = iswf.fixtures.smpl2;
- epv2.setName("foo");
- epv2.setDate(new Date());
- epv2.setNullable(1234567890L);
- epv2.setSize(123);
-
- iswf.persist(epv2);
-
- iswf.bounceSystem();
-
- // when search for object
- List<ObjectAdapter> retrievedInstance = getStore().loadInstancesAndAdapt(new PersistenceQueryFindByTitle(epvSpecification, epv2Adapter.titleString()));
-
- // then find
- assertEquals(1, retrievedInstance.size());
- final ObjectAdapter retrievedAdapter = retrievedInstance.get(0);
-
- assertNotSame(epv2Adapter, retrievedAdapter);
- assertEquals(((SimpleEntity)epv2Adapter.getObject()).getName(), ((SimpleEntity)retrievedAdapter.getObject()).getName());
- assertEquals(epv2Adapter.getOid(), retrievedAdapter.getOid());
-
- // and when search for some other title
- retrievedInstance = getStore().loadInstancesAndAdapt(new PersistenceQueryFindByTitle(epvSpecification, "some other title"));
-
- // then don't find
- assertEquals(0, retrievedInstance.size());
- }
-
-
- @Test
- public void updateInstance() throws Exception {
-
- // given persisted
- resetPersistenceStore();
- ObjectAdapter adapter = iswf.persist(iswf.fixtures.smpl2);
- final RootOid oid = (RootOid) adapter.getOid();
- iswf.bounceSystem();
-
- // when change
- adapter = iswf.reload(oid);
-
- SimpleEntity epv = (SimpleEntity) adapter.getObject();
- epv.setName("changed");
-
- iswf.bounceSystem();
-
- // then found
- List<ObjectAdapter> retrievedInstance = getStore().loadInstancesAndAdapt(new PersistenceQueryFindByTitle(epvSpecification, adapter.titleString()));
- assertEquals(1, retrievedInstance.size());
-
- final ObjectAdapter retrievedAdapter = retrievedInstance.get(0);
- assertNotSame(adapter, retrievedAdapter);
- assertEquals(((SimpleEntity)adapter.getObject()).getName(), ((SimpleEntity)retrievedAdapter.getObject()).getName());
- assertEquals(adapter.getOid(), retrievedAdapter.getOid());
- }
-
- @Test
- public void removeInstance() throws Exception {
-
- // given persisted
- iswf.beginTran();
- resetPersistenceStore();
- ObjectAdapter adapter = iswf.persist(iswf.fixtures.smpl2);
- final RootOid oid = (RootOid) adapter.getOid();
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- // when destroy
- iswf.beginTran();
- adapter = iswf.reload(oid);
-
- SimpleEntity epv = (SimpleEntity) adapter.getObject();
- iswf.destroy(epv);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- // then not found
- iswf.beginTran();
- assertEquals(false, getStore().hasInstances(epvSpecification));
- iswf.commitTran();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixturesTest_basicTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixturesTest_basicTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixturesTest_basicTest.java
deleted file mode 100644
index ac72288..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixturesTest_basicTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.tck.dom.scalars.JdkValuedEntity;
-
-public class IsisSystemWithFixturesTest_basicTest {
-
- @Rule
- public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-
- @Test
- public void savePojo() throws Exception {
-
- iswf.beginTran();
- assertThat(iswf.container.allInstances(JdkValuedEntity.class).size(), is(0));
-
- iswf.container.persist(iswf.fixtures.jve1);
-
- assertThat(iswf.container.allInstances(JdkValuedEntity.class).size(), is(1));
- iswf.commitTran();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/AbstractTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/AbstractTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/AbstractTest.java
deleted file mode 100644
index 010c130..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/AbstractTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport.legacy;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.applib.services.wrapper.WrapperObject;
-import org.apache.isis.core.integtestsupport.legacy.sample.domain.Country;
-import org.apache.isis.core.integtestsupport.legacy.sample.domain.Customer;
-import org.apache.isis.core.integtestsupport.legacy.sample.domain.Product;
-import org.apache.isis.core.integtestsupport.legacy.sample.fixtures.CountriesFixture;
-import org.apache.isis.core.integtestsupport.legacy.sample.fixtures.CustomerOrdersFixture;
-import org.apache.isis.core.integtestsupport.legacy.sample.fixtures.CustomersFixture;
-import org.apache.isis.core.integtestsupport.legacy.sample.fixtures.ProductsFixture;
-import org.apache.isis.core.integtestsupport.legacy.sample.service.CountryRepository;
-import org.apache.isis.core.integtestsupport.legacy.sample.service.CustomerRepository;
-import org.apache.isis.core.integtestsupport.legacy.sample.service.OrderRepository;
-import org.apache.isis.core.integtestsupport.legacy.sample.service.ProductRepository;
-import org.apache.isis.core.wrapper.WrapperFactoryDefault;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(IsisTestRunner.class)
-@Fixtures({ @Fixture(CountriesFixture.class), @Fixture(ProductsFixture.class), @Fixture(CustomersFixture.class), @Fixture(CustomerOrdersFixture.class) })
-@Services({ @Service(CountryRepository.class), @Service(ProductRepository.class), @Service(CustomerRepository.class), @Service(OrderRepository.class), @Service(WrapperFactoryDefault.class), @Service(EventBusService.Noop.class) })
-public abstract class AbstractTest {
-
- protected Customer custJsDO;
- protected Customer custJsWO;
-
- protected Product product355DO;
- protected Product product355WO;
-
- protected Product product850DO;
-
- protected Country countryGbrDO;
- protected Country countryGbrWO;
-
- protected Country countryUsaDO;
- protected Country countryAusDO;
-
- private ProductRepository productRepository;
- private CustomerRepository customerRepository;
- private CountryRepository countryRepository;
-
- private DomainObjectContainer domainObjectContainer;
- private WrapperFactory wrapperFactory;
-
- @Before
- public void setUp() {
-
- product355DO = productRepository.findByCode("355-40311");
- product355WO = wrapperFactory.wrap(product355DO);
- product850DO = productRepository.findByCode("850-18003");
-
- countryGbrDO = countryRepository.findByCode("GBR");
- countryGbrWO = wrapperFactory.wrap(countryGbrDO);
-
- countryUsaDO = countryRepository.findByCode("USA");
- countryAusDO = countryRepository.findByCode("AUS");
-
- custJsDO = customerRepository.findByName("Pawson");
- custJsWO = wrapperFactory.wrap(custJsDO);
-
- assertThat(product355WO instanceof WrapperObject, is(true));
- assertThat(countryGbrWO instanceof WrapperObject, is(true));
- assertThat(custJsWO instanceof WrapperObject, is(true));
- }
-
- @After
- public void tearDown() {
- }
-
- // //////////////////////////////////////////////////////
- // Injected.
- // //////////////////////////////////////////////////////
-
- protected WrapperFactory getWrapperFactory() {
- return wrapperFactory;
- }
-
- public void setWrapperFactory(final WrapperFactory headlessViewer) {
- this.wrapperFactory = headlessViewer;
- }
-
- protected DomainObjectContainer getDomainObjectContainer() {
- return domainObjectContainer;
- }
-
- public void setDomainObjectContainer(final DomainObjectContainer domainObjectContainer) {
- this.domainObjectContainer = domainObjectContainer;
- }
-
- protected ProductRepository getProductRepository() {
- return productRepository;
- }
-
- public void setProductRepository(final ProductRepository productRepository) {
- this.productRepository = productRepository;
- }
-
- protected CustomerRepository getCustomerRepository() {
- return customerRepository;
- }
-
- public void setCustomerRepository(final CustomerRepository customerRepository) {
- this.customerRepository = customerRepository;
- }
-
- protected CountryRepository getCountryRepository() {
- return countryRepository;
- }
-
- public void setCountryRepository(final CountryRepository countryRepository) {
- this.countryRepository = countryRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/DefaultAndChoicesTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/DefaultAndChoicesTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/DefaultAndChoicesTest.java
deleted file mode 100644
index edcc3a3..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/DefaultAndChoicesTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport.legacy;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class DefaultAndChoicesTest extends AbstractTest {
-
- @Test
- public void defaults() {
- final Object[] defaultPlaceOrder = custJsWO.defaultPlaceOrder();
- assertThat(defaultPlaceOrder.length, is(2));
- }
-
- @Ignore("not yet tested")
- @Test
- public void choicesDefaults() {
- // not tested.
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/InteractionListenerTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/InteractionListenerTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/InteractionListenerTest.java
deleted file mode 100644
index 8669781..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/InteractionListenerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport.legacy;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.services.wrapper.listeners.InteractionAdapter;
-import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
-import org.apache.isis.core.integtestsupport.legacy.sample.domain.Customer;
-
-public class InteractionListenerTest extends AbstractTest {
-
- @Test
- public void shouldBeAbleToAddListener() {
- final Customer proxiedCustRP = getWrapperFactory().wrap(custJsDO);
- final InteractionEvent[] events = { null };
- final InteractionListener l = new InteractionAdapter() {
- @Override
- public void propertyAccessed(final PropertyAccessEvent ev) {
- events[0] = ev;
- }
- };
- getWrapperFactory().addInteractionListener(l);
-
- proxiedCustRP.getFirstName();
- assertThat(events[0], notNullValue());
- final PropertyAccessEvent ev = (PropertyAccessEvent) events[0];
- assertThat(ev.getMemberNaturalName(), is("First Name"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/MemberDisabledTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/MemberDisabledTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/MemberDisabledTest.java
deleted file mode 100644
index 253d322..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/MemberDisabledTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.integtestsupport.legacy;
-
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import org.hamcrest.Matchers;
-import org.junit.Test;
-
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.core.integtestsupport.legacy.sample.domain.Order;
-import org.apache.isis.core.metamodel.facets.members.disabled.annotprop.DisabledFacetAnnotation;
-import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
-
-public class MemberDisabledTest extends AbstractTest {
-
- @Test
- public void whenValueDisabledForValueThenThrowsException() {
- custJsDO.disableFirstName = "cannot alter";
- try {
- custJsWO.setFirstName("Dick");
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot alter"));
- }
- }
-
- @Test
- public void whenValueDisabledForNullThenThrowsException() {
- custJsDO.disableFirstName = "cannot alter";
- try {
- custJsWO.setFirstName(null);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot alter"));
- }
- }
-
- @Test
- public void whenAssociationDisabledForReferenceThenThrowsException() {
- custJsDO.disableCountryOfBirth = "cannot alter";
- try {
- custJsWO.setCountryOfBirth(countryUsaDO);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot alter"));
- }
- }
-
- @Test
- public void whenAssociationDisabledForNullThenThrowsException() {
- custJsDO.disableCountryOfBirth = "cannot alter";
- try {
- custJsWO.setCountryOfBirth(null);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot alter"));
- }
- }
-
- @Test
- public void whenCollectionDisabledThenAddToThrowsException() {
- final List<Order> orders = custJsWO.getOrders();
- final Order order = orders.get(0);
- try {
- custJsWO.addToMoreOrders(order);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisabledFacetAnnotation.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("More Orders"));
- assertThat(ex.getMessage(), Matchers.containsString("Always disabled"));
- }
- }
-
- @Test
- public void whenCollectionDisabledThenRemovefromThrowsException() {
- custJsDO.addToVisitedCountries(countryUsaDO);
- custJsDO.disableVisitedCountries = "cannot alter";
- try {
- custJsWO.removeFromVisitedCountries(countryUsaDO);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Visited Countries"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot alter"));
- }
- }
-
- @Test
- public void whenActionDisabledThenThrowsException() {
- custJsDO.disablePlaceOrder = "cannot invoke";
- try {
- custJsWO.placeOrder(product355DO, 3);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Place Order"));
- assertThat(ex.getMessage(), Matchers.containsString("cannot invoke"));
- }
- }
-
-}