Skip to content

Commit

Permalink
move advanced/xml-advanced tests to testapps
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Sep 6, 2022
1 parent 6fc15fc commit 52b0d25
Show file tree
Hide file tree
Showing 770 changed files with 14,598 additions and 11,726 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand All @@ -12,10 +12,13 @@

// Contributors:
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.tests.weaving;
package org.eclipse.persistence.testing.framework;

// TopLink imports
import org.eclipse.persistence.logging.*;

import org.eclipse.persistence.logging.AbstractSessionLog;
import org.eclipse.persistence.logging.SessionLog;
import org.eclipse.persistence.logging.SessionLogEntry;

public class SimpleSessionLogWrapper extends AbstractSessionLog implements SessionLog {

Expand All @@ -29,7 +32,7 @@ public SimpleSessionLogWrapper(SessionLog sessionLog) {

@Override
public void log(SessionLogEntry entry) {
if (entry.getMessage().indexOf(expectedMessage) >= 0) {
if (entry.getMessage().contains(expectedMessage)) {
expected = true;
}
sessionLog.log(entry);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2019 IBM Corporation and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022 IBM Corporation and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -216,9 +216,7 @@ public void testFirstResultMaxResultPessimisticRead() {

/**
* This test verifies that aggregate queries will not fail with locking
* set.
*
* @see org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()
* set. See {@code org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()}
*/
@Test
public void testAggregateResultPessimisticForceIncrement() {
Expand All @@ -241,9 +239,7 @@ public void testAggregateResultPessimisticForceIncrement() {

/**
* This test verifies that queries that return non-Entity results will not
* fail up with locking set.
*
* @see org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()
* fail up with locking set. See {@code org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()}
*/
@Test
public void testObjectQueryPessimisticForceIncrement() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 IBM and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -241,7 +241,7 @@ public void testIntegerVersioning001() throws Exception {
}

/**
* Test based on org.eclipse.persistence.testing.tests.jpa.jpql.JUnitJPQLValidationTestSuite.JTAOptimisticLockExceptionTest()
* Test based on org.eclipse.persistence.testing.tests.jpa.jpql.advanced.JUnitJPQLValidationTestSuite.JTAOptimisticLockExceptionTest()
*
*/
@Test
Expand Down
971 changes: 11 additions & 960 deletions jpa/eclipselink.jpa.test/pom.xml

Large diffs are not rendered by default.

79 changes: 0 additions & 79 deletions jpa/eclipselink.jpa.test/src/it/assembly/assembly-client.xml

This file was deleted.

34 changes: 0 additions & 34 deletions jpa/eclipselink.jpa.test/src/it/assembly/assembly-ear.xml

This file was deleted.

88 changes: 0 additions & 88 deletions jpa/eclipselink.jpa.test/src/it/assembly/assembly-ejb.xml

This file was deleted.

28 changes: 0 additions & 28 deletions jpa/eclipselink.jpa.test/src/it/assembly/assembly-model.xml

This file was deleted.

28 changes: 0 additions & 28 deletions jpa/eclipselink.jpa.test/src/it/assembly/common-server-generic.xml

This file was deleted.

29 changes: 0 additions & 29 deletions jpa/eclipselink.jpa.test/src/it/assembly/common-server.xml

This file was deleted.

0 comments on commit 52b0d25

Please sign in to comment.