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:44 UTC
[41/56] [abbrv] ISIS-937: moved TCK out of core.
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/xmlos/TeamDomainRepository.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/xmlos/TeamDomainRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/xmlos/TeamDomainRepository.java
deleted file mode 100644
index bf6c494..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/xmlos/TeamDomainRepository.java
+++ /dev/null
@@ -1,50 +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.tck.dom.xmlos;
-
-import java.util.List;
-
-import org.apache.isis.applib.DomainObjectContainer;
-
-public class TeamDomainRepository {
-
- public List<Person> allPersons() {
- return container.allInstances(Person.class);
- }
-
- public List<Role> allRoles() {
- return container.allInstances(Role.class);
- }
-
- public List<Team> allTeams() {
- return container.allInstances(Team.class);
- }
-
-
- // {{ injected: DomainObjectContainer
- private DomainObjectContainer container;
-
- public void setDomainObjectContainer(final DomainObjectContainer container) {
- this.container = container;
- }
- // }}
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/resources/images/ToDoItem.gif
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/resources/images/ToDoItem.gif b/core/tck/tck-dom/src/main/resources/images/ToDoItem.gif
deleted file mode 100644
index cc536e1..0000000
Binary files a/core/tck/tck-dom/src/main/resources/images/ToDoItem.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
deleted file mode 100644
index 01cf5ad..0000000
--- a/core/tck/tck-fixture/pom.xml
+++ /dev/null
@@ -1,38 +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>
- </parent>
-
- <artifactId>isis-core-tck-fixture</artifactId>
- <name>Isis Core TCK Fixtures</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck-dom</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/LogonAsSvenFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/LogonAsSvenFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/LogonAsSvenFixture.java
deleted file mode 100644
index a815bbc..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/LogonAsSvenFixture.java
+++ /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.
- */
-
-package org.apache.isis.core.tck.fixture;
-
-import org.apache.isis.applib.fixtures.LogonFixture;
-
-public class LogonAsSvenFixture extends LogonFixture {
-
- public LogonAsSvenFixture() {
- super("sven");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/actions/ActionsEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/actions/ActionsEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/actions/ActionsEntityFixture.java
deleted file mode 100644
index 2a5e6ad..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/actions/ActionsEntityFixture.java
+++ /dev/null
@@ -1,52 +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.tck.fixture.actions;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.actions.ActionsEntity;
-import org.apache.isis.core.tck.dom.actions.ActionsEntityRepository;
-import org.apache.isis.core.tck.dom.busrules.BusRulesEntity;
-import org.apache.isis.core.tck.dom.busrules.BusRulesEntityRepository;
-
-public class ActionsEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity(1);
- createEntity(2);
- createEntity(3);
- createEntity(4);
- createEntity(5);
- }
-
- private ActionsEntity createEntity(Integer id) {
- final ActionsEntity entity = repository.newEntity();
- entity.setId(id);
- return entity;
- }
-
- // {{ injected: ActionSemanticsEntityRepository
- private ActionsEntityRepository repository;
-
- public void setActionSemanticsEntityRepository(final ActionsEntityRepository repository) {
- this.repository = repository;
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/busrules/BusRulesEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/busrules/BusRulesEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/busrules/BusRulesEntityFixture.java
deleted file mode 100644
index 39a84c4..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/busrules/BusRulesEntityFixture.java
+++ /dev/null
@@ -1,50 +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.tck.fixture.busrules;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.busrules.BusRulesEntity;
-import org.apache.isis.core.tck.dom.busrules.BusRulesEntityRepository;
-
-public class BusRulesEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity(1);
- createEntity(2);
- createEntity(3);
- createEntity(4);
- createEntity(5);
- }
-
- private BusRulesEntity createEntity(Integer id) {
- final BusRulesEntity entity = repository.newEntity();
- entity.setId(id);
- return entity;
- }
-
- // {{ injected: BusRulesEntityRepository
- private BusRulesEntityRepository repository;
-
- public void setBusRulesEntityRepository(final BusRulesEntityRepository repository) {
- this.repository = repository;
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/defaults/WithDefaultsEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/defaults/WithDefaultsEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/defaults/WithDefaultsEntityFixture.java
deleted file mode 100644
index 98fc917..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/defaults/WithDefaultsEntityFixture.java
+++ /dev/null
@@ -1,50 +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.tck.fixture.defaults;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity;
-import org.apache.isis.core.tck.dom.defaults.WithDefaultsEntityRepository;
-
-public class WithDefaultsEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity("John");
- createEntity("Mary");
- createEntity("Bill");
- createEntity("Sally");
- createEntity("Diedre");
- }
-
- private WithDefaultsEntity createEntity(final String name) {
- final WithDefaultsEntity entity = repository.newTransientEntity();
- persist(entity);
- return entity;
- }
-
- // {{ injected: WithDefaultsEntityRepository
- private WithDefaultsEntityRepository repository;
-
- public void setWithDefaultsEntityRepository(final WithDefaultsEntityRepository repository) {
- this.repository = repository;
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/refs/ParentEntitiesFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/refs/ParentEntitiesFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/refs/ParentEntitiesFixture.java
deleted file mode 100644
index 66e4eae..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/refs/ParentEntitiesFixture.java
+++ /dev/null
@@ -1,50 +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.tck.fixture.refs;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ParentEntityRepository;
-
-public class ParentEntitiesFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity("parent 1");
- createEntity("parent 2");
- createEntity("parent 3");
- createEntity("parent 4");
- createEntity("parent 5");
- }
-
- private ParentEntity createEntity(final String name) {
- final ParentEntity parent = parentEntityRepository.newEntity(name);
- parent.newChild("child 1");
- parent.newChild("child 2");
- return parent;
- }
-
- private ParentEntityRepository parentEntityRepository;
-
- public void setParentEntityRepository(final ParentEntityRepository parentEntityRepository) {
- this.parentEntityRepository = parentEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/ApplibValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/ApplibValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/ApplibValuedEntityFixture.java
deleted file mode 100644
index 4581d26..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/ApplibValuedEntityFixture.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.tck.fixture.scalars;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.ApplibValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.ApplibValuedEntityRepository;
-
-public class ApplibValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private ApplibValuedEntity createEntity() {
- return applibValuesEntityRepository.newEntity();
- }
-
- private ApplibValuedEntityRepository applibValuesEntityRepository;
-
- public void setApplibValuesEntityRepository(final ApplibValuedEntityRepository applibValuesEntityRepository) {
- this.applibValuesEntityRepository = applibValuesEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/DateTimeValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/DateTimeValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/DateTimeValuedEntityFixture.java
deleted file mode 100644
index c77b359..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/DateTimeValuedEntityFixture.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.tck.fixture.scalars;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.DateTimeValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.DateTimeValuedEntityRepository;
-
-public class DateTimeValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private DateTimeValuedEntity createEntity() {
- return dateTimeValuesEntityRepository.newEntity();
- }
-
- private DateTimeValuedEntityRepository dateTimeValuesEntityRepository;
-
- public void setDateTimeValuesEntityRepository(final DateTimeValuedEntityRepository dateTimeValuesEntityRepository) {
- this.dateTimeValuesEntityRepository = dateTimeValuesEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JdkValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JdkValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JdkValuedEntityFixture.java
deleted file mode 100644
index 73e5dd1..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JdkValuedEntityFixture.java
+++ /dev/null
@@ -1,81 +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.tck.fixture.scalars;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.util.Date;
-import javax.inject.Inject;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.JdkValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.JdkValuedEntityRepository;
-import org.apache.isis.core.tck.dom.scalars.MyEnum;
-
-public class JdkValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private JdkValuedEntity createEntity() {
- final JdkValuedEntity entity = jdkValuesEntityRepository.newEntity();
- entity.setBigDecimalProperty(new BigDecimal("12345678901234567890.1234567890"));
- entity.setBigDecimalProperty2(new BigDecimal("123.45"));
- entity.setBigIntegerProperty(new BigInteger("123456789012345678"));
- entity.setBigIntegerProperty2(new BigInteger("12345"));
- entity.setJavaSqlDateProperty(asSqlDate("2014-04-24"));
- entity.setJavaSqlTimeProperty(asSqlTime("1970-01-01T12:34:45Z"));
- entity.setJavaSqlTimestampProperty(new Timestamp(1234567890));
- entity.setJavaUtilDateProperty(asDateTime("2013-05-25T12:34:45Z"));
- entity.setMyEnum(MyEnum.RED);
- return entity;
- }
-
- private final static DateTimeFormatter yyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd").withZoneUTC();
- private final static DateTimeFormatter yyyyMMddTHHmmssZ = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ssZ").withZoneUTC();
-
- private static Date asDate(final String text) {
- return new java.util.Date(yyyyMMdd.parseDateTime(text).getMillis());
- }
-
- private static Date asDateTime(final String text) {
- return new java.util.Date(yyyyMMddTHHmmssZ.parseDateTime(text).getMillis());
- }
-
- private static java.sql.Date asSqlDate(final String text) {
- return new java.sql.Date(yyyyMMdd.parseDateTime(text).getMillis());
- }
-
- private static java.sql.Time asSqlTime(final String text) {
- return new java.sql.Time(yyyyMMddTHHmmssZ.parseDateTime(text).getMillis());
- }
-
- @Inject
- private JdkValuedEntityRepository jdkValuesEntityRepository;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java
deleted file mode 100644
index 42cb18b..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java
+++ /dev/null
@@ -1,55 +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.tck.fixture.scalars;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.JodaValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.JodaValuedEntityRepository;
-
-public class JodaValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private JodaValuedEntity createEntity() {
- final JodaValuedEntity jve = jodaValuesEntityRepository.newEntity();
- jve.setLocalDateProperty(new LocalDate(2008,3,21));
- jve.setLocalDateTimeProperty(new LocalDateTime(2009, 4, 29, 13, 45, 22));
- jve.setDateTimeProperty(new DateTime(2010, 3, 31, 9, 50, 43, DateTimeZone.UTC));
- return jve;
- }
-
- private JodaValuedEntityRepository jodaValuesEntityRepository;
-
- public void setJdkValuesEntityRepository(final JodaValuedEntityRepository jodaValuesEntityRepository) {
- this.jodaValuesEntityRepository = jodaValuesEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java
deleted file mode 100644
index e9db111..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java
+++ /dev/null
@@ -1,56 +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.tck.fixture.scalars;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntityRepository;
-
-public class PrimitiveValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private PrimitiveValuedEntity createEntity() {
- final PrimitiveValuedEntity pve = primitiveValuesEntityRepository.newEntity();
- pve.setBooleanProperty(true);
- pve.setByteProperty((byte)123);
- pve.setShortProperty((short)32123);
- pve.setCharProperty('a');
- pve.setIntProperty(987654321);
- pve.setLongProperty(2345678901234567890L);
- pve.setFloatProperty(12345678901234567890.1234567890F);
- pve.setDoubleProperty(12345678901234567890.1234567890);
- return pve;
- }
-
- private PrimitiveValuedEntityRepository primitiveValuesEntityRepository;
-
- public void setPrimitiveValuesEntityRepository(final PrimitiveValuedEntityRepository primitiveValuesEntityRepository) {
- this.primitiveValuesEntityRepository = primitiveValuesEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java
deleted file mode 100644
index 0d9d869..0000000
--- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java
+++ /dev/null
@@ -1,57 +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.tck.fixture.scalars;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntityRepository;
-
-public class WrapperValuedEntityFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- createEntity();
- }
-
- private WrapperValuedEntity createEntity() {
- final WrapperValuedEntity wve = wrapperValuesEntityRepository.newEntity();
- wve.setBooleanProperty(true);
- wve.setByteProperty((byte)123);
- wve.setShortProperty((short)32123);
- wve.setCharacterProperty('a');
- wve.setIntegerProperty(987654321);
- wve.setLongProperty(2345678901234567890L);
- wve.setFloatProperty(12345678901234567890.1234567890F);
- wve.setDoubleProperty(12345678901234567890.1234567890);
-
- return wve;
- }
-
- private WrapperValuedEntityRepository wrapperValuesEntityRepository;
-
- public void setPrimitiveValuesEntityRepository(final WrapperValuedEntityRepository wrapperValuesEntityRepository) {
- this.wrapperValuesEntityRepository = wrapperValuesEntityRepository;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/lib/.gitignore
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/lib/.gitignore b/core/tck/tck-integtests/lib/.gitignore
deleted file mode 100644
index 4c21459..0000000
--- a/core/tck/tck-integtests/lib/.gitignore
+++ /dev/null
@@ -1,24 +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.
-#
-
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/pom.xml b/core/tck/tck-integtests/pom.xml
deleted file mode 100644
index d2459fe..0000000
--- a/core/tck/tck-integtests/pom.xml
+++ /dev/null
@@ -1,105 +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>
- </parent>
-
- <artifactId>isis-core-tck-integtests</artifactId>
- <name>Isis Core TCK IntegTests</name>
-
- <properties>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>objectstore-jdo-datanucleus/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://isis.apache.org/${relativeUrl}</url>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
- <version>4.0</version>
- <scope>system</scope>
- <optional>true</optional>
- <systemPath>${basedir}/lib/sqljdbc4.jar</systemPath>
- </dependency>
- -->
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
deleted file mode 100644
index ebba602..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
+++ /dev/null
@@ -1,46 +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.objectstore.jdo.datanucleus;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DataNucleusPersistenceMechanismInstallerTest_getName {
-
- private DataNucleusPersistenceMechanismInstaller installer;
-
- @Before
- public void setUp() throws Exception {
- installer = new DataNucleusPersistenceMechanismInstaller();
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void isSet() {
- assertThat(installer.getName(), is("datanucleus"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_services.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_services.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_services.java
deleted file mode 100644
index 44a5b46..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_services.java
+++ /dev/null
@@ -1,62 +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.objectstore.jdo.datanucleus;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-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.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntityRepository;
-
-public class DataNucleusPersistenceMechanismInstallerTest_services {
-
- private PrimitiveValuedEntityRepository repo = new PrimitiveValuedEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .withServices(repo)
- .build();
-
- @Test
- public void servicesBootstrapped() {
- final List<Object> services = IsisContext.getServices();
- assertThat(services.size(), is(1));
- assertThat(services.get(0), is((Object)repo));
-
- final ObjectAdapter serviceAdapter = IsisContext.getPersistenceSession().getAdapterManager().getAdapterFor(repo);
- assertThat(serviceAdapter, is(not(nullValue())));
-
- assertThat(serviceAdapter.getOid(), is(equalTo((Oid)RootOidDefault.create(ObjectSpecId.of("PrimitiveValuedEntities"), "1"))));
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
deleted file mode 100644
index 5b0bb73..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
+++ /dev/null
@@ -1,124 +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.objectstore.jdo.datanucleus;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-
-public class Utils {
-
- private Utils(){}
-
- public static IsisSystemWithFixtures.Builder systemBuilder() {
- return IsisSystemWithFixtures.builder()
- .with(configurationForDataNucleusDb())
- .with(new DataNucleusPersistenceMechanismInstaller());
- }
-
- public static IsisSystemWithFixtures.Listener listenerToDeleteFrom(final String... tables) {
- return new IsisSystemWithFixtures.ListenerAdapter(){
-
- @Override
- public void postSetupSystem(boolean firstTime) throws Exception {
- Connection connection = getConnection();
- try {
- final Statement statement = connection.createStatement();
- for(String table: tables) {
- statement.executeUpdate("DELETE FROM " + table);
- }
- } catch(Exception ex) {
- connection.rollback();
- throw ex;
- } finally {
- connection.commit();
- }
- }
-
- private Connection getConnection() {
- final DataNucleusObjectStore objectStore = (DataNucleusObjectStore) IsisContext.getPersistenceSession().getObjectStore();
- return objectStore.getJavaSqlConnection();
- }
- };
- }
-
- public static IsisConfiguration configurationForDataNucleusDb() {
- final IsisConfigurationDefault configuration = new IsisConfigurationDefault();
- Properties props = new Properties();
-
- props.put("isis.persistor.datanucleus.impl.javax.jdo.PersistenceManagerFactoryClass", "org.datanucleus.api.jdo.JDOPersistenceManagerFactory");
-
- // last one wins!
- configureHsqlDbFileBased(props);
- configureForMsSqlServer(props);
- configureHsqlDbInMemory(props);
-
- props.put("isis.persistor.datanucleus.impl.datanucleus.autoCreateSchema", "true");
- props.put("isis.persistor.datanucleus.impl.datanucleus.validateTables", "true");
- props.put("isis.persistor.datanucleus.impl.datanucleus.validateConstraints", "true");
-
- props.put("isis.persistor.datanucleus.impl.datanucleus.cache.level2.type", "none");
-
- configuration.add(props);
- return configuration;
- }
-
-
- private static void configureHsqlDbInMemory(Properties props) {
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName", "sa");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword", "");
- }
-
- private static void configureHsqlDbFileBased(Properties props) {
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:file:hsql-db/test;hsqldb.write_delay=false;shutdown=true");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName", "sa");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword", "");
- }
-
- private static void configureForMsSqlServer(Properties props) {
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName", "com.microsoft.sqlserver.jdbc.SQLServerDriver");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo;");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName", "jdo");
- props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword", "jdopass");
- }
-
-
-
- public static long toMillis(int year, int monthOfYear, int dayOfMonth) {
- LocalDate d = new LocalDate(year, monthOfYear, dayOfMonth);
- return d.toDateMidnight().getMillis();
- }
-
- public static long toMillis(int year, int monthOfYear, int dayOfMonth, int hourOfDay, int minuteOfHour, int secondOfMinute) {
- LocalDateTime d = new LocalDateTime(year, monthOfYear, dayOfMonth, hourOfDay, minuteOfHour, secondOfMinute);
- return d.toDateTime().getMillis();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
deleted file mode 100644
index 012f9a6..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
+++ /dev/null
@@ -1,153 +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.objectstore.jdo.datanucleus.persistence.spi;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.math.BigInteger;
-import java.util.Date;
-
-import org.datanucleus.identity.OIDImpl;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-
-public class JdoObjectIdSerializerTest {
-
- @ObjectType("CUS")
- public static class Customer {}
-
- public static class CustomerRepository {
- public void foo(Customer x) {}
- }
-
- @Rule
- public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder()
- .withServices(new CustomerRepository())
- .build();
-
-
-
- @Test
- public void whenJavaxJdoIntIdentity() throws Exception {
- Object jdoObjectId = new javax.jdo.identity.IntIdentity(Customer.class, 123);
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
- assertThat(id, is("i_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoObjectIdRecreated, is(jdoObjectId));
- }
-
-
- @Test
- public void whenJavaxJdoStringIdentity() throws Exception {
- Object jdoObjectId = new javax.jdo.identity.StringIdentity(Customer.class, "123");
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
- assertThat(id, is("s_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoObjectIdRecreated, is(jdoObjectId));
- }
-
-
- @Test
- public void whenJavaxJdoLongIdentity() throws Exception {
- Object jdoObjectId = new javax.jdo.identity.LongIdentity(Customer.class, 123L);
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
- assertThat(id, is("l_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoObjectIdRecreated, is(jdoObjectId));
- }
-
-
- @Test
- public void whenLong() throws Exception {
- Object jdoOid = new OIDImpl(Customer.class.getName(), 123L);
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
- assertThat(id, is("L_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoOidRecreated, is((Object)("123"+ "[OID]" + Customer.class.getName())));
- }
-
- @Test
- public void whenDataNucleusOidAndLong() throws Exception {
- Object jdoOid = new OIDImpl(Customer.class.getName(), 123L);
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
- assertThat(id, is("L_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoOidRecreated, is((Object)("123"+ "[OID]" + Customer.class.getName())));
- }
-
- @Test
- public void whenDataNucleusOidAndBigInteger() throws Exception {
- Object jdoOid = new OIDImpl(Customer.class.getName(), new BigInteger("123"));
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
- assertThat(id, is("B_123"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoOidRecreated, is(((Object)("123"+ "[OID]" + Customer.class.getName()))));
- }
-
- @Test
- public void whenDataNucleusOidAndString() throws Exception {
- Object jdoOid = new OIDImpl(Customer.class.getName(), "456");
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
- assertThat(id, is("S_456"));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoOidRecreated, is((Object)("456" + "[OID]" + Customer.class.getName())));
- }
-
- @Test
- public void whenDataNucleusOidAndOtherKeyValue() throws Exception {
- Date key = new Date();
- Object jdoOid = new OIDImpl(Customer.class.getName(), key);
- String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
- assertThat(id, IsisMatchers.startsWith(OIDImpl.class.getName() + "_" + key.toString()));
-
- RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
-
- assertThat(jdoOidRecreated, is((Object)(key.toString() + "[OID]" + Customer.class.getName())));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
deleted file mode 100644
index 94087d7..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
+++ /dev/null
@@ -1,84 +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.objectstore.jdo.datanucleus.scenarios.adaptermanager;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-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.ResolveState;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_lazyLoading {
-
- private UnidirReferencingEntityRepository referencingRepo = new UnidirReferencingEntityRepository();
- private UnidirReferencedEntityRepository referencedRepo = new UnidirReferencedEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCINGENTITY"))
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCEDENTITY"))
- .withServices(referencingRepo, referencedRepo)
- .build();
-
- @Test
- public void lazyLoading_and_adapters() throws Exception {
- iswf.beginTran();
- referencedRepo.newEntity().setName("Referenced 1");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- UnidirReferencedEntity referencedEntity1 = referencedRepo.list().get(0);
-
- UnidirReferencingEntity referencingEntity1 = referencingRepo.newEntity();
- referencingEntity1.setName("Referencing 1");
- referencingEntity1.setReferenced(referencedEntity1);
-
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- List<UnidirReferencingEntity> list = referencingRepo.list();
- referencingEntity1 = list.get(0);
-
- assertThat(referencingEntity1.referenced, is(nullValue())); // lazy loading
- UnidirReferencedEntity referenced = referencingEntity1.getReferenced();
- ObjectAdapter referencedAdapter = iswf.adapterFor(referenced);
- assertThat(referencedAdapter.getResolveState(), is(ResolveState.RESOLVED));
- assertThat(referenced, is(not(nullValue())));
-
- iswf.commitTran();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
deleted file mode 100644
index 32487be..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
+++ /dev/null
@@ -1,102 +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.objectstore.jdo.datanucleus.scenarios.adaptermanager;
-
-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.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_loadObject {
-
- private UnidirReferencingEntityRepository referencingRepo = new UnidirReferencingEntityRepository();
- private UnidirReferencedEntityRepository referencedRepo = new UnidirReferencedEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCINGENTITY"))
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCEDENTITY"))
- .withServices(referencingRepo, referencedRepo)
- .build();
-
-
- @Test
- public void persist_then_update_using_persistentAdapterFor() throws Exception {
-
- iswf.beginTran();
- UnidirReferencedEntity referencedEntity1 = referencedRepo.newEntity();
- referencedEntity1.setName("Referenced 1");
- UnidirReferencedEntity referencedEntity2 = referencedRepo.newEntity();
- referencedEntity2.setName("Referenced 2");
-
- UnidirReferencingEntity referencingEntity1 = referencingRepo.newEntity();
- referencingEntity1.setName("Referencing 1");
- referencingEntity1.setReferenced(referencedEntity1);
- UnidirReferencingEntity referencingEntity2 = referencingRepo.newEntity();
- referencingEntity2.setName("Referencing 2");
- referencingEntity2.setReferenced(referencedEntity1);
- UnidirReferencingEntity referencingEntity3 = referencingRepo.newEntity();
- referencingEntity3.setName("Referencing 3");
- referencingEntity3.setReferenced(referencedEntity2);
-
- iswf.commitTran();
-
- TypedOid referencingOid2 = (TypedOid) iswf.adapterFor(referencingEntity2).getOid();
-
- TypedOid referencedOid1 = (TypedOid) iswf.adapterFor(referencedEntity1).getOid();
- TypedOid referencedOid2 = (TypedOid) iswf.adapterFor(referencedEntity2).getOid();
-
-
- // when ...
- iswf.bounceSystem();
-
- iswf.beginTran();
-
- ObjectAdapter referencingAdapter2 = iswf.getPersistor().loadObject(referencingOid2);
- referencingEntity2 = (UnidirReferencingEntity) referencingAdapter2.getObject();
-
- UnidirReferencedEntity referenced = referencingEntity2.getReferenced();
-
- ObjectAdapter referencedAdapter1 = iswf.getAdapterManager().adapterFor(referencedOid1);
- assertThat(referenced, is(referencedAdapter1.getObject()));
-
- // ...switch to refer to other
-
- ObjectAdapter referencedAdapter2 = iswf.getAdapterManager().adapterFor(referencedOid2);
- referencedEntity2 = (UnidirReferencedEntity) referencedAdapter2.getObject();
-
- referencingEntity2.setReferenced(referencedEntity2);
- iswf.commitTran();
-
- }
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
deleted file mode 100644
index 39d9833..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
+++ /dev/null
@@ -1,115 +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.objectstore.jdo.datanucleus.scenarios.adaptermanager;
-
-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.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_persistentAdapterFor {
-
- private UnidirReferencingEntityRepository referencingRepo = new UnidirReferencingEntityRepository();
- private UnidirReferencedEntityRepository referencedRepo = new UnidirReferencedEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCINGENTITY"))
- .with(Utils.listenerToDeleteFrom("UNIDIRREFERENCEDENTITY"))
- .withServices(referencingRepo, referencedRepo)
- .build();
-
-
- @Test
- public void persist_then_update_using_persistentAdapterFor() throws Exception {
-
- iswf.beginTran();
- UnidirReferencedEntity referencedEntity1 = referencedRepo.newEntity();
- referencedEntity1.setName("Referenced 1");
- UnidirReferencedEntity referencedEntity2 = referencedRepo.newEntity();
- referencedEntity2.setName("Referenced 2");
-
- UnidirReferencingEntity referencingEntity1 = referencingRepo.newEntity();
- referencingEntity1.setName("Referencing 1");
- referencingEntity1.setReferenced(referencedEntity1);
- UnidirReferencingEntity referencingEntity2 = referencingRepo.newEntity();
- referencingEntity2.setName("Referencing 2");
- referencingEntity2.setReferenced(referencedEntity1);
- UnidirReferencingEntity referencingEntity3 = referencingRepo.newEntity();
- referencingEntity3.setName("Referencing 3");
- referencingEntity3.setReferenced(referencedEntity2);
-
- iswf.commitTran();
-
- TypedOid referencingOid2 = (TypedOid) iswf.adapterFor(referencingEntity2).getOid();
-
- TypedOid referencedOid1 = (TypedOid) iswf.adapterFor(referencedEntity1).getOid();
- TypedOid referencedOid2 = (TypedOid) iswf.adapterFor(referencedEntity2).getOid();
-
-
- // when ...
- iswf.bounceSystem();
-
- iswf.beginTran();
-
- ObjectAdapter referencingAdapter2 = iswf.getAdapterManager().adapterFor(referencingOid2);
- referencingEntity2 = (UnidirReferencingEntity) referencingAdapter2.getObject();
-
- UnidirReferencedEntity referenced = referencingEntity2.getReferenced();
-
- ObjectAdapter referencedAdapter1 = iswf.getAdapterManager().adapterFor(referencedOid1);
- assertThat(referenced, is(referencedAdapter1.getObject()));
-
- // ...switch to refer to other
-
- ObjectAdapter referencedAdapter2 = iswf.getAdapterManager().adapterFor(referencedOid2);
- referencedEntity2 = (UnidirReferencedEntity) referencedAdapter2.getObject();
-
- referencingEntity2.setReferenced(referencedEntity2);
- iswf.commitTran();
-
- // then...
- iswf.bounceSystem();
-
- iswf.beginTran();
-
- referencingAdapter2 = iswf.getAdapterManager().adapterFor(referencingOid2);
- referencingEntity2 = (UnidirReferencingEntity) referencingAdapter2.getObject();
-
- referenced = referencingEntity2.getReferenced();
-
- referencedAdapter2 = iswf.getAdapterManager().adapterFor(referencedOid2);
-
- // ...is switched
- assertThat(referenced, is(referencedAdapter2.getObject()));
-
- iswf.commitTran();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithListParent.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithListParent.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithListParent.java
deleted file mode 100644
index b618efd..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithListParent.java
+++ /dev/null
@@ -1,86 +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.objectstore.jdo.datanucleus.scenarios.refs;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.BidirWithListChildEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithListParentEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithListParentEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_persist_bidirWithListParent {
-
- private BidirWithListParentEntityRepository repo = new BidirWithListParentEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("BIDIRWITHLISTCHILDeNTITY"))
- .with(Utils.listenerToDeleteFrom("BIDIRWITHLISTPARENTENTITY"))
- .withServices(repo)
- .build();
-
- @Test
- public void persistTwoParents() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- List<BidirWithListParentEntity> list = repo.list();
- assertThat(list.size(), is(2));
- iswf.commitTran();
- }
-
- @Test
- public void persistTwoChildrenOfParent() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- BidirWithListParentEntity retrievedEntity = repo.list().get(0);
- retrievedEntity.newChild("Child 1 of Parent 1");
- retrievedEntity.newChild("Child 2 of Parent 1");
- retrievedEntity.newChild("Child 3 of Parent 1");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- retrievedEntity = repo.list().get(0);
- List<BidirWithListChildEntity> children = retrievedEntity.getChildren();
- assertThat(children.size(), is(3));
- iswf.commitTran();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
deleted file mode 100644
index 21447b7..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
+++ /dev/null
@@ -1,127 +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.objectstore.jdo.datanucleus.scenarios.refs;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetChildEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_persist_bidirWithSetParent {
-
- private BidirWithSetParentEntityRepository repo = new BidirWithSetParentEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("BIDIRWITHSETCHILDENTITY"))
- .with(Utils.listenerToDeleteFrom("BIDIRWITHSETPARENTENTITY"))
- .withServices(repo)
- .build();
-
- @Test
- public void persistTwoParents() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- List<BidirWithSetParentEntity> list = repo.list();
- assertThat(list.size(), is(2));
- iswf.commitTran();
- }
-
- @Test
- public void persistTwoChildrenOfParent() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- BidirWithSetParentEntity retrievedEntity = repo.list().get(0);
- retrievedEntity.newChild("Child 1 of Parent 1");
- retrievedEntity.newChild("Child 2 of Parent 1");
- retrievedEntity.newChild("Child 3 of Parent 1");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- retrievedEntity = repo.list().get(0);
- Set<BidirWithSetChildEntity> children = retrievedEntity.getChildren();
- assertThat(children.size(), is(3));
- iswf.commitTran();
- }
-
- @Ignore("Not currently working, is an update")
- @Test
- public void updateBidirectional() throws Exception {
- iswf.beginTran();
- BidirWithSetParentEntity parent1 = repo.newEntity();
- parent1.setName("Parent 1");
- BidirWithSetParentEntity parent2 = repo.newEntity();
- parent2.setName("Parent 2");
-
- parent1.newChild("Child 1 of Parent 1");
- parent1.newChild("Child 2 of Parent 1");
- parent1.newChild("Child 3 of Parent 1");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- parent1 = repo.list().get(0);
- parent2 = repo.list().get(0);
- Set<BidirWithSetChildEntity> children = parent1.getChildren();
- assertThat(children.size(), is(3));
- BidirWithSetChildEntity child1 = parent1.getChildren().iterator().next();
- child1.moveTo(parent2);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- parent1 = repo.list().get(0);
- parent2 = repo.list().get(0);
- children = parent1.getChildren();
- assertThat(children.size(), is(2));
-
- children = parent2.getChildren();
- assertThat(children.size(), is(1));
- iswf.commitTran();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyclass.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyclass.java b/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyclass.java
deleted file mode 100644
index bb1b8c6..0000000
--- a/core/tck/tck-integtests/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyclass.java
+++ /dev/null
@@ -1,94 +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.objectstore.jdo.datanucleus.scenarios.refs;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.PolyClassChildEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntityRepository;
-import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-
-public class Persistence_persist_polyclass {
-
- private PolyClassParentEntityRepository repo = new PolyClassParentEntityRepository();
-
- @Rule
- public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("POLYCLASSSUBTYPE1ENTITY"))
- .with(Utils.listenerToDeleteFrom("POLYCLASSCHILDENTITY"))
- .with(Utils.listenerToDeleteFrom("POLYCLASSPARENTENTITY"))
- .withServices(repo)
- .build();
-
- @Test
- public void persistTwoParents() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- List<PolyClassParentEntity> list = repo.list();
- assertThat(list.size(), is(2));
- iswf.commitTran();
- }
-
- @Test
- public void persistSixDifferentChildrenOfParent() throws Exception {
- iswf.beginTran();
- repo.newEntity().setName("Parent 1");
- repo.newEntity().setName("Parent 2");
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- PolyClassParentEntity retrievedEntity = repo.list().get(0);
- retrievedEntity.newSubtype1("Child 1 of Parent 1", 123);
- retrievedEntity.newSubtype1("Child 2 of Parent 1", 456);
- retrievedEntity.newSubtype2("Child 3 of Parent 1", "abc");
- retrievedEntity.newSubtype2("Child 4 of Parent 1", "def");
- retrievedEntity.newSubtype3("Child 5 of Parent 1", BigDecimal.ONE);
- retrievedEntity.newSubtype3("Child 6 of Parent 1", BigDecimal.TEN);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- retrievedEntity = repo.list().get(0);
- Set<PolyClassChildEntity> children = retrievedEntity.getChildren();
- assertThat(children.size(), is(6));
- iswf.commitTran();
- }
-
-
-
-}