[geode] branch feature/GEODE-5212 updated: dont run in parallel
This is an automated email from the ASF dual-hosted git repository. sai_boorlagadda pushed a commit to branch feature/GEODE-5212 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-5212 by this push: new ed2daec dont run in parallel ed2daec is described below commit ed2daec51a1515fe13c63c97acfd5c7d49b73b3d Author: Sai Boorlagadda AuthorDate: Wed Jul 11 17:11:20 2018 -0700 dont run in parallel --- ci/pipelines/geode-build/base.yml | 197 +++--- 1 file changed, 98 insertions(+), 99 deletions(-) diff --git a/ci/pipelines/geode-build/base.yml b/ci/pipelines/geode-build/base.yml index 4857def..15ed4f6 100644 --- a/ci/pipelines/geode-build/base.yml +++ b/ci/pipelines/geode-build/base.yml @@ -218,108 +218,107 @@ jobs: - get: geode-ci-windows - get: geode-build-version passed: [Build] -- aggregate: - - task: run-acceptance-tests -tags: [windows] -timeout: 8h -config: - inputs: -- name: geode -- name: geode-ci-windows - path: geode-ci -- name: geode-build-version - outputs: -- name: built-geode - params: -CALL_STACK_TIMEOUT: 25200 -DUNIT_PARALLEL_FORKS: 0 -MAINTENANCE_VERSION: develop -PARALLEL_DUNIT: false -PUBLIC_BUCKET: ((!public-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) -JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" -DOCKER_COMPOSE_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker-compose.exe" -DOCKER_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker.exe" - platform: windows - run: -path: c:\Progra~1\git\bin\bash.exe -args: - - geode-ci/ci/scripts/test-run.sh - #- :geode-assembly:acceptanceTest :geode-connectors:acceptanceTest +- task: run-acceptance-tests + tags: [windows] + timeout: 8h + config: +inputs: + - name: geode + - name: geode-ci-windows +path: geode-ci + - name: geode-build-version +outputs: + - name: built-geode +params: + CALL_STACK_TIMEOUT: 25200 + DUNIT_PARALLEL_FORKS: 0 + MAINTENANCE_VERSION: develop + PARALLEL_DUNIT: false + PUBLIC_BUCKET: ((!public-bucket)) + SERVICE_ACCOUNT: ((!concourse-gcp-account)) + JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" + DOCKER_COMPOSE_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker-compose.exe" + DOCKER_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker.exe" +platform: windows +run: + path: c:\Progra~1\git\bin\bash.exe + args: +- geode-ci/ci/scripts/test-run.sh +#- :geode-assembly:acceptanceTest :geode-connectors:acceptanceTest +- :geode-assembly:acceptanceTest +- windows-acceptancetestfiles + ensure: +aggregate: +- task: archive-acceptance-test-results + tags: [windows] + config: +inputs: + - name: geode + - name: geode-ci-windows +path: geode-ci + - name: geode-build-version + - name: built-geode +params: + MAINTENANCE_VERSION: (( grab metadata.geode-build-branch )) + SERVICE_ACCOUNT: ((!concourse-gcp-account)) + PUBLIC_BUCKET: ((!public-bucket)) + JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" +platform: windows +run: + path: c:\Progra~1\git\bin\bash.exe + args: + - geode-ci/ci/scripts/test-archive.sh - :geode-assembly:acceptanceTest - windows-acceptancetestfiles -ensure: - aggregate: - - task: archive-acceptance-test-results -tags: [windows] -config: - inputs: -- name: geode -- name: geode-ci-windows - path: geode-ci -- name: geode-build-version -- name: built-geode - params: -MAINTENANCE_VERSION: (( grab metadata.geode-build-branch )) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) -PUBLIC_BUCKET: ((!public-bucket)) -JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" - platform: windows - run: -path: c:\Progra~1\git\bin\bash.exe -args: +- task: run-integration-tests + tags: [windows] + timeout: 8h + config: +inputs: + - name: geode + - name: geode-ci-windows +path: geode-ci + - name: geode-build-vers
[geode-native] branch develop updated: Revert "Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability."
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git The following commit(s) were added to refs/heads/develop by this push: new 8d0a31d Revert "Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability." 8d0a31d is described below commit 8d0a31d0c17b97cd11c0fae8970e7009b535680c Author: Blake Bender AuthorDate: Wed Jul 11 14:03:01 2018 -0700 Revert "Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability." Co-authored-by: Mike Martell This reverts commit 07575871d7971322408129049f538531effe8fb1. --- packer/windows/install-ssh.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/windows/install-ssh.ps1 b/packer/windows/install-ssh.ps1 index 9faec8f..8cdfa18 100644 --- a/packer/windows/install-ssh.ps1 +++ b/packer/windows/install-ssh.ps1 @@ -18,6 +18,6 @@ $ErrorActionPreference = "Stop" write-host "Installing OpenSSH" -choco install openssh -params '"/SSHServerFeature"' -confirm +choco install openssh -params '"/SSHServerFeature"' --version 0.0.24.0 -confirm schtasks.exe /Create /TN init-ssh /RU SYSTEM /SC ONSTART /TR "powershell.exe -File 'C:\Program Files\Amazon\Ec2ConfigService\Scripts\init-ssh.ps1'"
[geode] branch feature/GEODE-5212 updated: run all tests
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch feature/GEODE-5212
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5212 by this
push:
new 802850e run all tests
802850e is described below
commit 802850e367e08c059fd5bf525e01ecb73ed37291
Author: Sai Boorlagadda
AuthorDate: Wed Jul 11 15:58:44 2018 -0700
run all tests
---
ci/scripts/test-run.sh | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/ci/scripts/test-run.sh b/ci/scripts/test-run.sh
index cc8c88d..e441981 100755
--- a/ci/scripts/test-run.sh
+++ b/ci/scripts/test-run.sh
@@ -139,19 +139,10 @@ pushd ${GEODE_BUILD}
set +e
echo "Running tests"
set -x
- GRADLE_SPECIAL_OPTIONS=""
- if [ "${GRADLE_TASK}" = ":geode-assembly:acceptanceTest" ]; then
-GRADLE_SPECIAL_OPTIONS="--tests DeployWithLargeJarTest"
- fi
-
- if [ "${GRADLE_TASK}" = "integrationTest" ]; then
-GRADLE_TASK="geode-core:integrationTest"
-GRADLE_SPECIAL_OPTIONS="--tests AbstractLauncherIntegrationTest"
- fi
#./gradlew --no-daemon -x javadoc -x spotlessCheck
:geode-assembly:acceptanceTest --tests
org.apache.geode.management.internal.cli.commands.PutCommandWithJsonTest
./gradlew ${PARALLEL_DUNIT} ${DUNIT_PARALLEL_FORKS} ${DUNIT_DOCKER_IMAGE} \
- --system-prop "java.io.tmpdir=${TMPDIR}" ${DEFAULT_GRADLE_TASK_OPTIONS}
${GRADLE_TASK_OPTIONS} ${GRADLE_TASK} ${GRADLE_SPECIAL_OPTIONS}
+ --system-prop "java.io.tmpdir=${TMPDIR}" ${DEFAULT_GRADLE_TASK_OPTIONS}
${GRADLE_TASK_OPTIONS} ${GRADLE_TASK}
export GRADLE_EXIT_STATUS=$?
set +x
popd
[geode] branch feature/GEODE-5212 updated: Added aggregate for running tasks parallel
This is an automated email from the ASF dual-hosted git repository. sai_boorlagadda pushed a commit to branch feature/GEODE-5212 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-5212 by this push: new 489a8be Added aggregate for running tasks parallel 489a8be is described below commit 489a8be01ddb26ffcdfb72b32960c355d9125244 Author: Sai Boorlagadda AuthorDate: Wed Jul 11 14:16:16 2018 -0700 Added aggregate for running tasks parallel --- ci/pipelines/geode-build/base.yml | 205 +++--- 1 file changed, 100 insertions(+), 105 deletions(-) diff --git a/ci/pipelines/geode-build/base.yml b/ci/pipelines/geode-build/base.yml index 54ac45d..4857def 100644 --- a/ci/pipelines/geode-build/base.yml +++ b/ci/pipelines/geode-build/base.yml @@ -218,113 +218,108 @@ jobs: - get: geode-ci-windows - get: geode-build-version passed: [Build] -- task: run-acceptance-tests - tags: [windows] - timeout: 8h - config: -inputs: -- name: geode -- name: geode-ci-windows - path: geode-ci -- name: geode-build-version -outputs: -- name: built-geode -params: - CALL_STACK_TIMEOUT: 25200 - DUNIT_PARALLEL_FORKS: 0 - MAINTENANCE_VERSION: develop - PARALLEL_DUNIT: false - PUBLIC_BUCKET: ((!public-bucket)) - SERVICE_ACCOUNT: ((!concourse-gcp-account)) - JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" - DOCKER_COMPOSE_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker-compose.exe" - DOCKER_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker.exe" -platform: windows -run: - path: c:\Progra~1\git\bin\bash.exe - args: -- geode-ci/ci/scripts/test-run.sh -#- :geode-assembly:acceptanceTest :geode-connectors:acceptanceTest -- :geode-assembly:acceptanceTest -- windows-acceptancetestfiles - ensure: -aggregate: -- task: archive-acceptance-test-results - tags: [windows] - config: -inputs: - - name: geode - - name: geode-ci-windows -path: geode-ci - - name: geode-build-version - - name: built-geode -params: - MAINTENANCE_VERSION: (( grab metadata.geode-build-branch )) - SERVICE_ACCOUNT: ((!concourse-gcp-account)) - PUBLIC_BUCKET: ((!public-bucket)) - JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" -platform: windows -run: - path: c:\Progra~1\git\bin\bash.exe - args: - - geode-ci/ci/scripts/test-archive.sh - - :geode-assembly:acceptanceTest - - windows-acceptancetestfiles -- task: run-integration-tests - tags: [windows] - timeout: 8h - config: -inputs: -- name: geode -- name: geode-ci-windows - path: geode-ci -- name: geode-build-version -outputs: -- name: built-geode -params: - CALL_STACK_TIMEOUT: 25200 - DUNIT_PARALLEL_FORKS: 0 - MAINTENANCE_VERSION: develop - PARALLEL_DUNIT: false - PUBLIC_BUCKET: ((!public-bucket)) - SERVICE_ACCOUNT: ((!concourse-gcp-account)) - JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" -platform: windows -run: - path: c:\Progra~1\git\bin\bash.exe - args: -- geode-ci/ci/scripts/test-run.sh -- integrationTest -- windows-integrationtestfiles -#on_failure: -# aggregate: -#- put: send-notification-email -# params: -#subject: built-geode/subject -#body: built-geode/body - ensure: -aggregate: -- task: archive-integration-test-results - tags: [windows] - config: -inputs: - - name: geode - - name: geode-ci-windows -path: geode-ci - - name: geode-build-version - - name: built-geode -params: - MAINTENANCE_VERSION: (( grab metadata.geode-build-branch )) - SERVICE_ACCOUNT: ((!concourse-gcp-account)) - PUBLIC_BUCKET: ((!public-bucket)) - JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" -platform: windows -run: - path: c:\Progra~1\git\bin\bash.exe - args: - - geode-ci/ci/scripts/test-archive.sh +- aggregate: + - task: run-acceptance-tests +tags: [windows] +timeout: 8h +config: + inputs: +- name: geode +- name: geode-ci-windows + path: geode-ci +- name: geode-bu
[geode] branch develop updated: GEODE-5408 Update docs for gfsh remove --all (#2119)
This is an automated email from the ASF dual-hosted git repository.
kmiller pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 2e1673b GEODE-5408 Update docs for gfsh remove --all (#2119)
2e1673b is described below
commit 2e1673b3d347aea542416c736c9c3ab1359dc1ad
Author: Karen Miller
AuthorDate: Wed Jul 11 13:42:34 2018 -0700
GEODE-5408 Update docs for gfsh remove --all (#2119)
---
.../gfsh/command-pages/remove.html.md.erb | 30 --
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/geode-docs/tools_modules/gfsh/command-pages/remove.html.md.erb
b/geode-docs/tools_modules/gfsh/command-pages/remove.html.md.erb
index 16e808b..a1c4a01 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/remove.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/remove.html.md.erb
@@ -36,28 +36,32 @@ remove --region=value [--key=value] [--all(=value)?]
[--key-class=value]
| \\-\\-key| String or JSON text
that will be used to create a key to retrieve a value . |
|
| ‑‑key‑class | Fully
qualified class name of the key's type. | key
constraint for the current region or String |
| \\-\\-region | *Required.* Region
from which to remove the entry. |
|
-| \\-\\-all| Clears the region
by removing all entries. | false
|
-
-Table 1. Remove Parameters
+| \\-\\-all| A boolean value
that, when true, clears the region by removing all entries. This option is not
available for partitioned regions. | false
|
**Example Commands:**
``` pre
-gfsh>remove --region=/region1/region12 --key=('id': '133abg134')
-gfsh>remove --region=/region1/region12 --key=('id': '133abg134')
--key-class=data.ProfileKey
-gfsh>remove --region=/region1/region12 --all
+gfsh>remove --region=/region1 --key=('id': '133abg134')
+gfsh>remove --region=/region1 --key=('id': '133abg134')
--key-class=data.ProfileKey
+gfsh>remove --region=/region1 --all=true
```
**Error Messages:**
``` pre
-"Region name is either empty or Null";
-"Key is either empty or Null";
-"Value is either empty or Null";
-"Region <{0}> not found in any of the members";
-"Region <{0}> Not Found";
-"Key is not present in the region";
-"Cleared all keys in the region";
+"Region name is either empty or Null"
+
+"Key is either empty or Null"
+
+"Value is either empty or Null"
+
+"Region <{0}> not found in any of the members"
+
+"Region <{0}> Not Found"
+
+"Key is not present in the region"
+
+"Option --all is not supported on partitioned region"
```
[geode] branch feature/GEODE-5212 updated: git base doesnt seem to see PATH, so use full name
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch feature/GEODE-5212
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5212 by this
push:
new 23481d2 git base doesnt seem to see PATH, so use full name
23481d2 is described below
commit 23481d22a6f5775e2d3c7780453f5f33238391f4
Author: Sai Boorlagadda
AuthorDate: Wed Jul 11 13:34:08 2018 -0700
git base doesnt seem to see PATH, so use full name
---
ci/scripts/test-archive.sh | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ci/scripts/test-archive.sh b/ci/scripts/test-archive.sh
index ff0ef39..076f0fa 100755
--- a/ci/scripts/test-archive.sh
+++ b/ci/scripts/test-archive.sh
@@ -33,10 +33,13 @@ if [ -e "${GEODE_PULL_REQUEST_ID_FILE}" ]; then
GEODE_PULL_REQUEST_ID=$(cat ${GEODE_PULL_REQUEST_ID_FILE})
fi
+GCLOUD=gcloud
+GSUTIL=gsutil
UNAME_O=$(uname -o)
# Check for Windows (MINGW64) environment
if [ ${UNAME_O} = "Msys" ]; then
- export PATH="${PATH}:/c/Program Files (x86)/Google/Cloud
SDK/google-cloud-sdk/platform/bundledpython:/c/Program Files (x86)/Google/Cloud
SDK/google-cloud-sdk/platform/gsutil"
+ GCLOUD=gcloud.cmd
+ GSUTIL=gsutil.cmd
fi
env | sort
@@ -90,10 +93,10 @@ echo "GRADLE_TASK = ${GRADLE_TASK}"
echo "BASE_FILENAME = ${BASE_FILENAME}"
set +e
-gcloud info
-gcloud config set account ${SERVICE_ACCOUNT}
+$GCLOUD info
+$GCLOUD config set account ${SERVICE_ACCOUNT}
-gsutil ls gs://files.apachegeode-ci.info/
+$GSUTIL ls gs://files.apachegeode-ci.info/
set -e
export FILENAME=${BASE_FILENAME}-${FULL_PRODUCT_VERSION}.tgz
@@ -125,7 +128,7 @@ if [ ! -d "${GEODE_BUILD}/build/reports/combined" ]; then
fi
pushd ${GEODE_BUILD}/build/reports/combined
-gsutil -q -m cp -r * gs://${TEST_RESULTS_DESTINATION}
+$GSUTIL -q -m cp -r * gs://${TEST_RESULTS_DESTINATION}
popd
echo ""
@@ -134,7 +137,7 @@ printf "\033[92mhttp://${TEST_RESULTS_DESTINATION}\033[0m\n";
printf
"\033[92m=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\033[0m\n"
printf "\n"
-gsutil cp ${DEST_DIR}/${FILENAME} gs://${TEST_ARTIFACTS_DESTINATION}
+$GSUTIL cp ${DEST_DIR}/${FILENAME} gs://${TEST_ARTIFACTS_DESTINATION}
printf "\033[92mTest artifacts from this job are available at:\033[0m\n"
printf "\n"
[geode-native] branch develop updated: Update docker file to improve doc builds
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 4f72d8b Update docker file to improve doc builds
4f72d8b is described below
commit 4f72d8b8fe8ca6046e355b835d96f2dec94a6629
Author: Ivan Godwin
AuthorDate: Wed Jul 11 09:53:30 2018 -0700
Update docker file to improve doc builds
---
docker/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c01c78e..e0d88e2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download&filename=creadur
tar xjf -
ENV CMAKE_VERSION 3.10.3
-RUN wget
"https://cmake.org/files/LatestRelease/cmake-${CMAKE_VERSION}-Linux-x86_64.sh";
-O /tmp/cmake && \
+RUN wget
"https://cmake.org/files/PreviousRelease/cmake-${CMAKE_VERSION}-Linux-x86_64.sh";
-O /tmp/cmake && \
bash /tmp/cmake --skip-license --prefix=/usr/local && \
rm /tmp/cmake
[geode] branch develop updated: GEODE-5404: Created static default whitelist and modified to call length
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new a96edf2 GEODE-5404: Created static default whitelist and modified to
call length
a96edf2 is described below
commit a96edf2e6fc988bd96ce78e6011d080494ec18df
Author: Barry Oglesby
AuthorDate: Wed Jul 11 09:51:58 2018 -0700
GEODE-5404: Created static default whitelist and modified to call length
---
.../RestrictedMethodInvocationAuthorizer.java | 10 ++-
.../cache/tier/sockets/BaseCommandQuery.java | 6 +-
.../RestrictedMethodInvocationAuthorizerTest.java | 14 +++
.../QuerySecurityDistinctQueryDistributedTest.java | 99 ++
.../apache/geode/security/query/data/PdxTrade.java | 61 +
5 files changed, 185 insertions(+), 5 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
index 254c817..bd28886 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
@@ -31,6 +31,8 @@ public class RestrictedMethodInvocationAuthorizer implements
MethodInvocationAut
public static final String UNAUTHORIZED_STRING = "Unauthorized access to
method: ";
+ protected static final HashMap DEFAULT_WHITELIST =
createWhiteList();
+
private SecurityService securityService;
// List of methods that can be invoked by
@@ -39,10 +41,10 @@ public class RestrictedMethodInvocationAuthorizer
implements MethodInvocationAut
public RestrictedMethodInvocationAuthorizer(SecurityService securityService)
{
this.securityService = securityService;
-whiteListedMethodsToClass = createWhiteList();
+whiteListedMethodsToClass = DEFAULT_WHITELIST;
}
- private HashMap createWhiteList() {
+ private static HashMap createWhiteList() {
HashMap whiteListMap = new HashMap();
Set objectCallers = new HashSet();
objectCallers.add(Object.class);
@@ -122,6 +124,10 @@ public class RestrictedMethodInvocationAuthorizer
implements MethodInvocationAut
return whiteListMap;
}
+ protected HashMap getWhiteList() {
+return whiteListedMethodsToClass;
+ }
+
boolean isWhitelisted(Method method) {
String methodName = method.getName();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
index a162e75..7dcffb5 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -364,7 +364,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
}
Object[] results = new Object[MAXIMUM_CHUNK_SIZE];
for (int i = 0; i < MAXIMUM_CHUNK_SIZE; i++) {
-if ((resultIndex) == selectResults.size()) {
+if ((resultIndex) == objs.length) {
incompleteArray = true;
break;
}
@@ -425,7 +425,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
}
if (sendResults) {
-writeQueryResponseChunk(results, collectionType, (resultIndex ==
selectResults.size()),
+writeQueryResponseChunk(results, collectionType, (resultIndex ==
objs.length),
servConn);
if (logger.isDebugEnabled()) {
@@ -435,7 +435,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
}
// If we have reached the last element of SelectResults then we should
// break out of loop here only.
- if (resultIndex == selectResults.size()) {
+ if (resultIndex == objs.length) {
break;
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
index 0f5e589..e72cebe 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.cache.query.internal;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -483,6 +484,19 @@ public class RestrictedMethodInvocationAuthorizerTest {
testNumberMethods(AtomicLong.class);
}
+ @Test
+ pub
[geode-native] branch develop updated: Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git The following commit(s) were added to refs/heads/develop by this push: new 0757587 Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability. 0757587 is described below commit 07575871d7971322408129049f538531effe8fb1 Author: Blake Bender AuthorDate: Tue Jul 10 13:47:31 2018 -0700 Remove version specifier from install-ssh. Moving to latest version for Windows, to see if that helps some of the instability. Co-authored-by: Mike Martell --- packer/windows/install-ssh.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/windows/install-ssh.ps1 b/packer/windows/install-ssh.ps1 index 8cdfa18..9faec8f 100644 --- a/packer/windows/install-ssh.ps1 +++ b/packer/windows/install-ssh.ps1 @@ -18,6 +18,6 @@ $ErrorActionPreference = "Stop" write-host "Installing OpenSSH" -choco install openssh -params '"/SSHServerFeature"' --version 0.0.24.0 -confirm +choco install openssh -params '"/SSHServerFeature"' -confirm schtasks.exe /Create /TN init-ssh /RU SYSTEM /SC ONSTART /TR "powershell.exe -File 'C:\Program Files\Amazon\Ec2ConfigService\Scripts\init-ssh.ps1'"
[geode] branch feature/GEODE-5363 deleted (was a01271b)
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a change to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git. was a01271b GEODE-5363: Rebase cleanup This change permanently discards the following revisions: discard a01271b GEODE-5363: Rebase cleanup discard 05d2560 GEODE-5363: Run uiTests from new source set. discard bd5ceda GEODE-5363: Remove category filter. discard 011a66a GEODE-5363: Remove parallel changes. discard 02d42d1 GEODE-5363: Remove acceptanceTest category discard 2cd9583 GEODE-5363: Run acceptanceTest from new source set. discard 042d7ac GEODE-5363: Removes DistributedTest category. discard 4dd085a GEODE-5363: Run distributed tests from new sourceSet discard e2383f3 GEODE-5363: Rebase cleanup. discard 4523d8d GEODE-5363: Allow parallel tests. discard 9368439 GEODE-5363: Fixes tomcat tests. discard 4951855 GEODE-5363: Cleanup discard 836dccd GEODE-5363: Ignore inner classes. discard 6d7ecaf GEODE-5363: Fixes tomcat tests. discard 76614c8 GEODE-5363: Removes IntegrationTest category. discard 352d4ab GEODE-5363: Move codeAnalysis resources to integrationTest discard 3a3331e GEODE-5363: Run integration tests from new source set. discard c4a5128 GEODE-5363: Cleanup unit tests. discard 580cb2c GEODE-5363: Remove UnitTest category from unit tests. discard 8bebc44 GEODE-5363: Don't use UnitTest category to run unit tests. discard 3ab17cb GEODE-5363: Cleanup dependencies and format. discard 10ecd0a GEODE-5363: Moves geode-old-client-support tests into new source sets. discard 79a48be GEODE-5363: Moves geode-experimental-driver tests into new source sets. discard dbdd63b GEODE-5363: Moves geode-protobuf tests into new source sets. discard c3a8ec6 GEODE-5363: Moves geode-rebalancer tests into new source sets. discard ad28899 GEODE-5363: Moves geode-web tests into new source sets. discard 62e0e72 GEODE-5363: Moves geode-web-api tests into new source sets. discard 3fd9c3f GEODE-5363: Moves geode-modules-session tests into new source sets. discard c90d7e7 GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets. discard c391aa6 GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets. discard 809792f GEODE-5363: Moves geode-modules tests into new source sets. discard 76ad7b4 GEODE-5363: Moves geode-assembly tests into new source sets. discard 4b41ef6 GEODE-5363: Moves geode-lucene tests into new source sets. discard c618c3a GEODE-5363: Moves geode-cq tests into new source sets. discard a21d027 GEODE-5363: Moves geode-wan tests into new source sets. discard 4dc6086 GEODE-5363: Moves geode-junit tests into new source sets. discard 9a02153 GEODE-5363: Moves pulse tests into new source sets. discard 87623b1 GEODE-5363: Moves performance tests into new source set. discard 2b6d256 GEODE-5363: Moves distributed tests into new source set. discard 1f4b251 GEODE-5363: Moves distributed tests into new source set. discard dc3f323 GEODE-5363: Moves distributed tests into new source set. discard fd8e66e GEODE-5363: Moves distributed tests into new source set. discard 35693ba GEODE-5363: Moves distributed tests into new source set. discard e1fa87e GEODE-5363: Creates distributed test source set. discard 63f0d88 GEODE-5363: Move integration tests to new directory. discard eb6aae0 GEODE-5363: Creates integration test source set.
[geode] 44/46: GEODE-5363: Remove category filter.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bd5cedab7b8d368d528c779b80ba329488b43a40
Author: Jacob Barrett
AuthorDate: Wed Jul 11 08:12:44 2018 -0700
GEODE-5363: Remove category filter.
---
gradle/test.gradle | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 61459ee..7f91df9 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -145,16 +145,12 @@ subprojects {
testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
classpath = sourceSets.acceptanceTest.runtimeClasspath
-
-useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
-}
-
forkEvery 1
outputs.upToDateWhen{false}
}
+
task flakyTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
[geode] branch develop updated: GEODE-5379: Reset affinityRetryCount to zero only when initial retry count is zero to avoid stack overflow (#2098)
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new b4796e6 GEODE-5379: Reset affinityRetryCount to zero only when
initial retry count is zero to avoid stack overflow (#2098)
b4796e6 is described below
commit b4796e6d6667ba2815871ea7f81d48fb92af87b1
Author: pivotal-eshu
AuthorDate: Wed Jul 11 09:13:21 2018 -0700
GEODE-5379: Reset affinityRetryCount to zero only when initial retry count
is zero to avoid stack overflow (#2098)
---
.../cache/client/internal/OpExecutorImpl.java | 97 --
.../geode/cache/client/internal/TXFailoverOp.java | 2 +-
.../client/internal/OpExecutorImplJUnitTest.java | 82 ++
3 files changed, 136 insertions(+), 45 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
index 4116dde..7ae4745 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/OpExecutorImpl.java
@@ -75,7 +75,7 @@ public class OpExecutorImpl implements ExecutablePool {
private static final boolean TRY_SERVERS_ONCE =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX +
"PoolImpl.TRY_SERVERS_ONCE");
- private static final int TX_RETRY_ATTEMPT =
+ static final int TX_RETRY_ATTEMPT =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "txRetryAttempt",
500);
private final ConnectionManager connectionManager;
@@ -102,6 +102,7 @@ public class OpExecutorImpl implements ExecutablePool {
private boolean serverAffinityFailover = false;
private final ThreadLocal affinityServerLocation =
new ThreadLocal();
+
private final ThreadLocal affinityRetryCount = new
ThreadLocal() {
protected Integer initialValue() {
return 0;
@@ -226,53 +227,53 @@ public class OpExecutorImpl implements ExecutablePool {
* @param op the op to execute
* @return the result of execution
*/
- private Object executeWithServerAffinity(ServerLocation loc, Op op) {
+ Object executeWithServerAffinity(ServerLocation loc, Op op) {
+final int initialRetryCount = getAffinityRetryCount();
try {
- Object retVal = executeOnServer(loc, op, true, false);
- affinityRetryCount.set(0);
- return retVal;
-} catch (ServerConnectivityException e) {
- if (logger.isDebugEnabled()) {
-logger.debug("caught exception while executing with affinity:{}",
e.getMessage(), e);
- }
- if (!this.serverAffinityFailover || e instanceof
ServerOperationException) {
-affinityRetryCount.set(0);
-throw e;
+ try {
+return executeOnServer(loc, op, true, false);
+ } catch (ServerConnectivityException e) {
+if (logger.isDebugEnabled()) {
+ logger.debug("caught exception while executing with affinity:{}",
e.getMessage(), e);
+}
+if (!this.serverAffinityFailover || e instanceof
ServerOperationException) {
+ throw e;
+}
+int retryCount = getAffinityRetryCount();
+if ((retryAttempts != -1 && retryCount >= retryAttempts)
+|| retryCount > TX_RETRY_ATTEMPT) {
+ // prevent stack overflow
+ throw e;
+}
+setAffinityRetryCount(retryCount + 1);
}
- int retryCount = affinityRetryCount.get();
- if ((retryAttempts != -1 && retryCount >= retryAttempts) || retryCount >
TX_RETRY_ATTEMPT) { // prevent
-
// stack
-
// overflow
-
// fixes
-
// bug
-
// 46535
-affinityRetryCount.set(0);
-throw e;
+ this.affinityServerLocation.set(null);
+ if (logger.isDebugEnabled()) {
+logger.debug("reset server affinity: attempting txFailover");
+ }
+ // send TXFailoverOp, so that new server can
+ // do bootstrapping, then re-execute original op
+ AbstractOp absOp = (AbstractOp) op;
+ absOp.getMessage().setIsRetry();
+ int transactionId = absOp.getMessage().getTransactionId();
+ // for CommitOp we do not have transactionId in AbstractOp
+ // so set it explicitly for TXFailoverOp
+ TXFailoverOp.execute(this.pool, transactionId);
+
+ if (op instanceof ExecuteRegionFunctionOpImpl) {
[geode] 41/46: GEODE-5363: Run acceptanceTest from new source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2cd9583c46e813b9fecce058f932c0831e4bc68b
Author: Jacob Barrett
AuthorDate: Wed Jul 11 07:35:43 2018 -0700
GEODE-5363: Run acceptanceTest from new source set.
---
gradle/test.gradle | 36
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 20a4d1c..7ec5ced 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -101,6 +101,15 @@ subprojects {
}
resources.srcDir file('src/distributedTest/resources')
}
+
+acceptanceTest {
+ java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+}
}
task integrationTest(type:Test) {
@@ -142,6 +151,25 @@ subprojects {
outputs.upToDateWhen{false}
}
+ task acceptanceTest(type:Test) {
+testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
+classpath = sourceSets.acceptanceTest.runtimeClasspath
+
+
+useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
+}
+
+forkEvery 1
+
+if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
+outputs.upToDateWhen{false}
+ }
+
task flakyTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
@@ -352,14 +380,6 @@ subprojects {
forkEvery 30
}
- task acceptanceTest(type:Test) {
-useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
-}
-forkEvery 1
-outputs.upToDateWhen{false}
- }
-
// apply common test configuration
gradle.taskGraph.whenReady( { graph ->
tasks.withType(Test).each { test ->
[geode] 36/46: GEODE-5363: Fixes tomcat tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 93684393d286e8174dda6793a798d5252e352a4e
Author: Jacob Barrett
AuthorDate: Mon Jul 9 17:28:37 2018 -0700
GEODE-5363: Fixes tomcat tests.
---
.../src/{test => integrationTest}/resources/tomcat/conf/tomcat-users.xml | 0
.../tomcat/temp => integrationTest/resources/tomcat/logs}/.gitkeep| 0
.../tomcat/logs => integrationTest/resources/tomcat/temp}/.gitkeep| 0
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git
a/extensions/geode-modules/src/test/resources/tomcat/conf/tomcat-users.xml
b/extensions/geode-modules/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from
extensions/geode-modules/src/test/resources/tomcat/conf/tomcat-users.xml
rename to
extensions/geode-modules/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
diff --git a/extensions/geode-modules/src/test/resources/tomcat/temp/.gitkeep
b/extensions/geode-modules/src/integrationTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from extensions/geode-modules/src/test/resources/tomcat/temp/.gitkeep
rename to
extensions/geode-modules/src/integrationTest/resources/tomcat/logs/.gitkeep
diff --git a/extensions/geode-modules/src/test/resources/tomcat/logs/.gitkeep
b/extensions/geode-modules/src/integrationTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from extensions/geode-modules/src/test/resources/tomcat/logs/.gitkeep
rename to
extensions/geode-modules/src/integrationTest/resources/tomcat/temp/.gitkeep
[geode] 42/46: GEODE-5363: Remove acceptanceTest category
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 02d42d15d4245ab2ea24aeb1a28aff28db13887b
Author: Jacob Barrett
AuthorDate: Wed Jul 11 07:41:24 2018 -0700
GEODE-5363: Remove acceptanceTest category
---
.../cli/commands/ConfigureEvictionThroughGfsh.java | 3 ---
.../cli/commands/DeployWithLargeJarTest.java | 3 ---
.../cli/commands/DestroyIndexIfExistsTest.java | 3 ---
.../cli/commands/GfshStartLocatorLogTest.java | 3 ---
.../cli/commands/ImportClusterConfigTest.java | 3 ---
...scribeConfigAreFullyRedactedAcceptanceTest.java | 3 ---
.../cli/commands/PutCommandWithJsonTest.java | 3 ---
.../cli/commands/StartLocatorAcceptanceTest.java | 3 ---
.../cli/commands/StatusLocatorRealGfshTest.java| 3 ---
.../cli/commands/StopServerAcceptanceTest.java | 3 ---
.../StopServerWithSecurityAcceptanceTest.java | 3 ---
.../cli/shell/GfshDisconnectWithinScript.java | 3 ---
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 3 ---
.../shell/StatusServerExitCodeAcceptanceTest.java | 3 ---
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 3 ---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 3 ---
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 3 ---
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 3 ---
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 3 ---
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 3 ---
.../PostgresJdbcAsyncWriterIntegrationTest.java| 3 ---
.../jdbc/PostgresJdbcDistributedTest.java | 3 ---
.../jdbc/PostgresJdbcLoaderIntegrationTest.java| 3 ---
.../jdbc/PostgresJdbcWriterIntegrationTest.java| 3 ---
.../MySqlTableMetaDataManagerIntegrationTest.java | 3 ---
...ostgresTableMetaDataManagerIntegrationTest.java | 3 ---
.../TableMetaDataManagerIntegrationTest.java | 3 ---
.../test/junit/categories/AcceptanceTest.java | 26 --
30 files changed, 113 deletions(-)
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
index 710abc9..e40ec3a 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
@@ -22,16 +22,13 @@ import java.io.IOException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
// GEODE-1897 Users should be able to configure eviction through gfsh
-@Category(AcceptanceTest.class)
public class ConfigureEvictionThroughGfsh {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
index 82d0900..2cf835d 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
@@ -21,14 +21,11 @@ import java.util.stream.Collectors;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class DeployWithLargeJarTest {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
index f17f78c..12e47af 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
@@ -19,14 +19,11 @@ import static org.assertj.cor
[geode] 39/46: GEODE-5363: Run distributed tests from new sourceSet
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4dd085a0ceb1ce155aeecca25af7cc98ef41cd9c
Author: Jacob Barrett
AuthorDate: Mon Jul 9 22:43:38 2018 -0700
GEODE-5363: Run distributed tests from new sourceSet
---
.../apache/geode/cache30/GlobalLockingDUnitTest.java | 2 +-
.../geode/test/dunit/rules/DistributedTestRule.java | 2 --
gradle/test.gradle| 19 +++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
index 69be5ee..667bc1c 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, DLockTest.class})
public class GlobalLockingDUnitTest extends JUnit4CacheTestCase {
- public static Region region_testBug32356;
+ private static Region region_testBug32356;
public GlobalLockingDUnitTest() {
super();
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
index c8af8a9..e01e1f3 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.query.QueryTestUtils;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache30.ClientServerTestCase;
-import org.apache.geode.cache30.GlobalLockingDUnitTest;
import org.apache.geode.cache30.MultiVMRegionTestCase;
import org.apache.geode.cache30.RegionTestCase;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -212,7 +211,6 @@ public class DistributedTestRule extends
AbstractDistributedTestRule {
DiskStoreObserver.setInstance(null);
unregisterInstantiatorsInThisVM();
DistributionMessageObserver.setInstance(null);
- GlobalLockingDUnitTest.region_testBug32356 = null;
InitialImageOperation.slowImageProcessing = 0;
InternalClientMembership.unregisterAllListeners();
LogWrapper.close();
diff --git a/gradle/test.gradle b/gradle/test.gradle
index ea0192d..858b623 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -92,6 +92,15 @@ subprojects {
}
resources.srcDir file('src/integrationTest/resources')
}
+
+distributedTest {
+ java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+}
}
task integrationTest(type:Test) {
@@ -116,11 +125,21 @@ subprojects {
}
task distributedTest(type:Test) {
+testClassesDirs = sourceSets.distributedTest.output.classesDirs
+classpath = sourceSets.distributedTest.runtimeClasspath
+
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.DistributedTest'
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
+
forkEvery 1
+
+if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
outputs.upToDateWhen{false}
}
[geode] 13/46: GEODE-5363: Moves geode-cq tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c618c3aa7a7ff8138b65ae4822986a9617359e21
Author: Jacob Barrett
AuthorDate: Mon Jul 2 22:05:51 2018 -0700
GEODE-5363: Moves geode-cq tests into new source sets.
---
geode-cq/build.gradle | 34 ++
.../geode/cache/query/cq/CQDistributedTest.java| 0
.../cache/query/cq/dunit/CqDataDUnitTest.java | 0
.../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqDataUsingPoolDUnitTest.java | 0
.../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 0
.../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 0
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 0
.../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqQueryUsingPoolDUnitTest.java | 0
.../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java| 0
...esultSetUsingPoolOptimizedExecuteDUnitTest.java | 0
.../dunit/CqSecurityAuthorizedUserDUnitTest.java | 0
...SecurityPartitionedAuthorizedUserDUnitTest.java | 0
...curityPartitionedUnauthorizedUserDUnitTest.java | 0
.../dunit/CqSecurityUnauthorizedUserDUnitTest.java | 0
.../cache/query/cq/dunit/CqStateDUnitTest.java | 0
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 0
.../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 0
.../CqStatsUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cache/query/cq/dunit/CqTimeTestListener.java | 0
.../dunit/PartitionedRegionCqQueryDUnitTest.java | 0
...onedRegionCqQueryOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 0
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java| 0
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 0
.../cache/query/dunit/PdxQueryCQTestBase.java | 0
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 0
.../cache/query/dunit/QueryMonitorDUnitTest.java | 0
.../cache/snapshot/ClientSnapshotDUnitTest.java| 0
.../cache/PRDeltaPropagationDUnitTest.java | 0
.../geode/internal/cache/PutAllCSDUnitTest.java| 0
.../cache/RemoteCQTransactionDUnitTest.java| 0
.../internal/cache/ha/CQListGIIDUnitTest.java | 0
.../internal/cache/ha/HADispatcherDUnitTest.java | 0
.../tier/sockets/ClientServerMiscBCDUnitTest.java | 0
.../tier/sockets/ClientToServerDeltaDUnitTest.java | 0
.../sockets/DeltaPropagationWithCQDUnitTest.java | 0
...ltaToRegionRelationCQRegistrationDUnitTest.java | 0
.../tier/sockets/DurableClientCrashDUnitTest.java | 0
.../sockets/DurableClientNetDownDUnitTest.java | 0
.../tier/sockets/DurableClientSimpleDUnitTest.java | 0
.../cache/tier/sockets/DurableClientTestCase.java | 0
.../management/CacheServerManagementDUnitTest.java | 0
.../cli/commands/ClientCommandsTestUtils.java | 0
.../commands/DescribeClientCommandDUnitTest.java | 0
.../commands/DurableClientCommandsDUnitTest.java | 0
.../cli/commands/ListClientCommandDUnitTest.java | 0
.../management/internal/pulse/TestCQDUnitTest.java | 0
.../internal/pulse/TestClientsDUnitTest.java | 0
.../internal/pulse/TestServerDUnitTest.java| 0
.../security/CQPDXPostProcessorDUnitTest.java | 0
.../geode/security/CQPostProcessorDunitTest.java | 0
.../security/ClientAuthorizationCQDUnitTest.java | 0
.../security/ClientAuthzObjectModDUnitTest.java| 0
.../geode/security/ClientCQAuthDUnitTest.java | 0
.../ClientCQPostAuthorizationDUnitTest.java| 0
.../security/ClientPostAuthorizationDUnitTest.java | 0
.../geode/security/ClientQueryAuthDUnitTest.java | 0
.../geode/security/MultiUserAPIDUnitTest.java | 0
.../security/MultiUserDurableCQAuthzDUnitTest.java | 0
.../apache/geode/cache/query/cq/CQJUnitTest.java | 0
.../AnalyzeCQSerializablesJUnitTest.java | 0
66 files changed, 34 insertions(+)
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index c5e4c02..2c48067 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -19,7 +19,41 @@ dependencies {
compileOnly project(':geode-core')
testCompile project(':geode-core')
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
testCompile project(':geode-junit')
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + tes
[geode] 45/46: GEODE-5363: Run uiTests from new source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 05d2560b1943f9ca4810123c2ebc337027019cc6
Author: Jacob Barrett
AuthorDate: Wed Jul 11 08:44:44 2018 -0700
GEODE-5363: Run uiTests from new source set.
---
geode-assembly/build.gradle| 8
.../tools/pulse/ui/PulseAcceptanceAuthTest.java| 3 ---
.../tools/pulse/ui/PulseAcceptanceNoAuthTest.java | 3 ---
.../apache/geode/test/junit/categories/UITest.java | 21
geode-pulse/build.gradle | 12 ---
.../tools/pulse/tests/junit/BaseServiceTest.java | 3 ---
.../pulse/tests/ui/PulseAnonymousUserTest.java | 3 ---
.../geode/tools/pulse/tests/ui/PulseAuthTest.java | 3 ---
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 3 ---
.../tools/pulse/tests/ui/PulseNoAuthTest.java | 3 ---
gradle/test.gradle | 23 --
11 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 8319b09..2dbf7f4 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -440,14 +440,6 @@ def dependOnInstalledProduct = {
environment ('GEODE_HOME', install)
}
-task uiTest(type: Test) {
-useJUnit {
-includeCategories 'org.apache.geode.test.junit.categories.UITest'
-excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
-}
-forkEvery(1)
-}
-
// Add the configuration closure to the test targets so they depend on the
install directory
test dependOnInstalledProduct
acceptanceTest dependOnInstalledProduct
diff --git
a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
index caae0b7..d8aab18 100644
---
a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
+++
b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
@@ -22,12 +22,10 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.openqa.selenium.WebDriver;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@@ -35,7 +33,6 @@ import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
public class PulseAcceptanceAuthTest extends PulseAcceptanceTestBase {
@ClassRule
diff --git
a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
index 6b9a806..6ee6374 100644
---
a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
+++
b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
@@ -20,11 +20,9 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.openqa.selenium.WebDriver;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@@ -32,7 +30,6 @@ import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
public class PulseAcceptanceNoAuthTest extends PulseAcceptanceTestBase {
@ClassRule
diff --git
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
deleted file mode 100755
index 9c54c4c..000
---
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
+++ /dev/null
@@ -1,21 +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
[geode] 37/46: GEODE-5363: Allow parallel tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4523d8d5db576fbce7a4232216df72adf18e8e41
Author: Jacob Barrett
AuthorDate: Mon Jul 9 17:29:29 2018 -0700
GEODE-5363: Allow parallel tests.
---
gradle/test.gradle | 6 ++
1 file changed, 6 insertions(+)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index e7e9e58..ea0192d 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -103,6 +103,12 @@ subprojects {
}
forkEvery 1
+
+if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
[geode] 43/46: GEODE-5363: Remove parallel changes.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 011a66a236802127eb378ced3dd6669f63556c11
Author: Jacob Barrett
AuthorDate: Wed Jul 11 08:10:27 2018 -0700
GEODE-5363: Remove parallel changes.
---
gradle/test.gradle | 15 ---
1 file changed, 15 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 7ec5ced..61459ee 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -122,11 +122,6 @@ subprojects {
forkEvery 1
-if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
-if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
@@ -143,11 +138,6 @@ subprojects {
forkEvery 1
-if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
-if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
outputs.upToDateWhen{false}
}
@@ -162,11 +152,6 @@ subprojects {
forkEvery 1
-if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
-if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
outputs.upToDateWhen{false}
}
[geode] 20/46: GEODE-5363: Moves geode-web-api tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 62e0e72b7201cb3ebd15358d78356d68ca5f7145
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:11:03 2018 -0700
GEODE-5363: Moves geode-web-api tests into new source sets.
---
geode-web-api/build.gradle | 33 ++
.../AnalyzeWebApiSerializablesJUnitTest.java | 0
2 files changed, 33 insertions(+)
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 346e3c8..c3d5bb2 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -72,3 +72,36 @@ war {
// from the runtime classpath
classpath configurations.runtime
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
b/geode-web-api/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
similarity index 100%
rename from
geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
rename to
geode-web-api/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
[geode] 24/46: GEODE-5363: Moves geode-experimental-driver tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 79a48bef8e2ae1c1545ce6abf349565796354774
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:25:50 2018 -0700
GEODE-5363: Moves geode-experimental-driver tests into new source sets.
---
geode-experimental-driver/build.gradle | 21 +
.../experimental/driver/AuthenticationTest.java | 0
.../experimental/driver/DriverConnectionTest.java | 0
.../driver/FunctionServiceIntegrationTest.java | 0
.../driver/PostProcessingIntegrationTest.java | 0
.../driver/QueryServiceIntegrationTest.java | 0
.../experimental/driver/RegionIntegrationTest.java | 0
.../apache/geode/experimental/driver/SSLTest.java | 0
.../driver/ValueSerializerIntegrationTest.java | 0
9 files changed, 21 insertions(+)
diff --git a/geode-experimental-driver/build.gradle
b/geode-experimental-driver/build.gradle
index 1a4badc..e8dcdb7 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -25,3 +25,24 @@ dependencies {
testCompile project(':geode-protobuf')
testCompile files(project(':geode-core').sourceSets.test.output)
}
+
+configurations {
+integrationTestCompile.extendsFrom testCompile
+integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+integrationTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+}
+}
+
+dependencies {
+// TODO build - move dunit framework to shared module.
+integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/AuthenticationTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/AuthenticationTest.java
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
diff --git
a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
similarity index 100%
rename from
geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
rename to
geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/Reg
[geode] 08/46: GEODE-5363: Moves distributed tests into new source set.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit 2b6d2563088382230e2a2980950b7d432a7e254d Author: Jacob Barrett AuthorDate: Mon Jul 2 16:07:31 2018 -0700 GEODE-5363: Moves distributed tests into new source set. --- geode-core/build.gradle| 12 ++-- .../cache/query/dunit/QueryUsingPoolDUnitTest.java | 72 .../index/IndexTrackingQueryObserverDUnitTest.java | 50 +- .../cache/CustomerIDPartitionResolver.java | 76 ++ .../java/hydra/MethExecutor.java | 0 .../java/hydra/MethExecutorResult.java | 0 .../java/hydra/SchedulingOrder.java| 0 .../apache/geode/cache/query/QueryTestUtils.java | 0 .../apache/geode/cache/query/dunit/TestObject.java | 76 ++ .../functional/OrderByPartitionedJUnitTest.java| 2 +- .../index/IndexTrackingQueryObserverJUnitTest.java | 1 - .../internal/index/IndexTrackingTestHook.java | 63 ++ .../geode/cache30/CacheSerializableRunnable.java | 0 .../apache/geode/cache30/ClientServerTestCase.java | 0 .../geode/cache30/GlobalLockingDUnitTest.java | 0 .../geode/cache30/MultiVMRegionTestCase.java | 0 .../org/apache/geode/cache30/RegionTestCase.java | 0 .../apache/geode/cache30/TestCacheCallback.java| 0 .../apache/geode/cache30/TestCacheListener.java| 0 .../org/apache/geode/cache30/TestCacheLoader.java | 0 .../org/apache/geode/cache30/TestCacheWriter.java | 0 .../distributed/LauncherIntegrationTestCase.java | 0 .../apache/geode/distributed/LocatorCommand.java | 0 .../LocatorLauncherIntegrationTestCase.java| 0 .../LocatorLauncherRemoteIntegrationTestCase.java | 0 .../apache/geode/distributed/ServerCommand.java| 0 .../ServerLauncherIntegrationTestCase.java | 0 .../ServerLauncherLocalIntegrationTestCase.java| 0 .../ServerLauncherRemoteIntegrationTestCase.java | 0 .../TestServerLauncherCacheProvider.java | 0 .../geode/distributed/UsesLocatorCommand.java | 0 .../geode/distributed/UsesServerCommand.java | 0 .../membership/gms/MembershipManagerHelper.java| 0 .../gms/membership/GMSJoinLeaveTestHelper.java | 0 .../membership/gms/messenger/InterceptUDP.java | 0 .../cache/tier/sockets/CacheServerTestUtil.java| 0 .../geode/internal/offheap/OffHeapRegionBase.java | 0 .../java/org/apache/geode/test/dunit/Assert.java | 0 .../apache/geode/test/dunit/AsyncInvocation.java | 0 .../apache/geode/test/dunit/DUnitBlackboard.java | 0 .../java/org/apache/geode/test/dunit/DUnitEnv.java | 0 .../org/apache/geode/test/dunit/Disconnect.java| 0 .../geode/test/dunit/DistributedTestUtils.java | 0 .../java/org/apache/geode/test/dunit/Host.java | 0 .../apache/geode/test/dunit/IgnoredException.java | 0 .../java/org/apache/geode/test/dunit/Invoke.java | 0 .../java/org/apache/geode/test/dunit/Jitter.java | 0 .../apache/geode/test/dunit/LogWriterUtils.java| 0 .../org/apache/geode/test/dunit/NamedCallable.java | 0 .../org/apache/geode/test/dunit/NamedRunnable.java | 0 .../org/apache/geode/test/dunit/RMIException.java | 0 .../geode/test/dunit/RepeatableRunnable.java | 0 .../geode/test/dunit/SerializableCallable.java | 0 .../geode/test/dunit/SerializableCallableIF.java | 0 .../geode/test/dunit/SerializableRunnable.java | 0 .../geode/test/dunit/SerializableRunnableIF.java | 0 .../geode/test/dunit/StoppableWaitCriterion.java | 0 .../org/apache/geode/test/dunit/ThreadUtils.java | 0 .../java/org/apache/geode/test/dunit/VM.java | 0 .../java/org/apache/geode/test/dunit/Wait.java | 0 .../org/apache/geode/test/dunit/WaitCriterion.java | 0 .../dunit/cache/internal/CacheTestFixture.java | 0 .../dunit/cache/internal/JUnit4CacheTestCase.java | 0 .../dunit/internal/DistributedTestFixture.java | 0 .../test/dunit/internal/InternalBlackboard.java| 0 .../dunit/internal/InternalBlackboardImpl.java | 0 .../dunit/internal/JUnit4DistributedTestCase.java | 0 .../dunit/rules/AbstractDistributedTestRule.java | 0 .../test/dunit/rules/DistributedTestRule.java | 0 .../geode/test/dunit/rules/RemoteInvoker.java | 0 .../geode/test/dunit/standalone/BounceResult.java | 0 .../geode/test/dunit/standalone/ChildVM.java | 0 .../geode/test/dunit/standalone/DUnitLauncher.java | 0 .../test/dunit/standalone/ProcessManager.java | 0 .../geode/test/dunit/standalone/RemoteDUnitVM.java | 0 .../test/dunit/standalone/RemoteDUnitVMIF.java | 0 .../test/dunit/standalone/StandAloneDUnitEnv.java | 0 .../geode/test/junit/rules/GfshCommandRule.java| 0 .../geode/test/junit/rules/LocatorStarterRule.java | 0 .../geode/test/junit/
[geode] 15/46: GEODE-5363: Moves geode-assembly tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76ad7b43890863669fda0a53d692086093227041
Author: Jacob Barrett
AuthorDate: Mon Jul 2 22:37:03 2018 -0700
GEODE-5363: Moves geode-assembly tests into new source sets.
---
geode-assembly/build.gradle| 56 ++
.../cli/commands/ConfigureEvictionThroughGfsh.java | 0
.../cli/commands/ConnectCommandAcceptanceTest.java | 0
.../cli/commands/DeployWithLargeJarTest.java | 0
.../cli/commands/DestroyIndexIfExistsTest.java | 0
.../cli/commands/GfshStartLocatorLogTest.java | 0
.../cli/commands/ImportClusterConfigTest.java | 0
...scribeConfigAreFullyRedactedAcceptanceTest.java | 0
.../cli/commands/PutCommandWithJsonTest.java | 0
.../cli/commands/StartLocatorAcceptanceTest.java | 0
.../cli/commands/StatusLocatorRealGfshTest.java| 0
.../cli/commands/StopServerAcceptanceTest.java | 0
.../StopServerWithSecurityAcceptanceTest.java | 0
.../cli/shell/GfshDisconnectWithinScript.java | 0
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 0
.../shell/StatusServerExitCodeAcceptanceTest.java | 0
.../LauncherLifecycleCommandsDUnitTest.java| 0
.../internal/web/RestFunctionExecuteDUnitTest.java | 0
.../RestAPIOnRegionFunctionExecutionDUnitTest.java | 0
.../internal/web/controllers/RestAPITestBase.java | 0
.../controllers/RestAPIsAndInterOpsDUnitTest.java | 0
...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 0
...estAPIsOnMembersFunctionExecutionDUnitTest.java | 0
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 0
.../apache/geode/session/tests/CargoTestBase.java | 0
.../tests/GenericAppServerClientServerTest.java| 0
.../tests/Jetty9CachingClientServerTest.java | 0
.../session/tests/Jetty9ClientServerTest.java | 0
.../org/apache/geode/session/tests/Jetty9Test.java | 0
.../session/tests/Tomcat6ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat6Test.java| 0
.../session/tests/Tomcat7ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat7Test.java| 0
.../session/tests/Tomcat8ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat8Test.java| 0
.../session/tests/TomcatClientServerTest.java | 0
.../TomcatSessionBackwardsCompatibilityTest.java | 0
.../org/apache/geode/BundledJarsJUnitTest.java | 0
.../management/internal/AgentUtilJUnitTest.java| 0
.../cli/commands/GemfireCoreClasspathTest.java | 0
.../StartLocatorCommandIntegrationTest.java| 0
.../StartServerCommandIntegrationTest.java | 0
.../internal/web/RestInterfaceIntegrationTest.java | 0
.../internal/web/RestSecurityIntegrationTest.java | 0
.../web/RestSecurityPostProcessorTest.java | 0
.../rest/internal/web/RestSecurityWithSSLTest.java | 0
.../internal/web/RestServersIntegrationTest.java | 0
.../web/SwaggerVerificationIntegrationTest.java| 0
.../PdxBasedCrudControllerIntegrationTest.java | 0
.../RestQueryAndFunctionIntegrationTest.java | 0
.../geode/tools/pulse/PulseConnectivityTest.java | 0
.../geode/tools/pulse/PulseDataExportTest.java | 0
.../tools/pulse/PulseJmxPasswordFileTest.java | 0
.../tools/pulse/PulseSecurityIntegrationTest.java | 0
.../geode/tools/pulse/PulseSecurityTest.java | 0
.../tools/pulse/PulseSecurityWithSSLTest.java | 0
.../tools/pulse/ui/PulseAcceptanceAuthTest.java| 0
.../tools/pulse/ui/PulseAcceptanceNoAuthTest.java | 0
58 files changed, 56 insertions(+)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 8609535..3d3f469 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -490,3 +490,59 @@ task dumpInstalledJars(dependsOn: installDist) {
};
}
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ acceptanceTestCompile.extendsFrom testCompile
+ acceptanceTestRuntime.extendsFrom testRuntime
+ uiTestCompile.extendsFrom testCompile
+ uiTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+ }
+ acceptanceTest {
+java {
+ compileClasspath += main.output + tes
[geode] branch feature/GEODE-5363 created (now a01271b)
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a change to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git. at a01271b GEODE-5363: Rebase cleanup This branch includes the following new commits: new eb6aae0 GEODE-5363: Creates integration test source set. new 63f0d88 GEODE-5363: Move integration tests to new directory. new e1fa87e GEODE-5363: Creates distributed test source set. new 35693ba GEODE-5363: Moves distributed tests into new source set. new fd8e66e GEODE-5363: Moves distributed tests into new source set. new dc3f323 GEODE-5363: Moves distributed tests into new source set. new 1f4b251 GEODE-5363: Moves distributed tests into new source set. new 2b6d256 GEODE-5363: Moves distributed tests into new source set. new 87623b1 GEODE-5363: Moves performance tests into new source set. new 9a02153 GEODE-5363: Moves pulse tests into new source sets. new 4dc6086 GEODE-5363: Moves geode-junit tests into new source sets. new a21d027 GEODE-5363: Moves geode-wan tests into new source sets. new c618c3a GEODE-5363: Moves geode-cq tests into new source sets. new 4b41ef6 GEODE-5363: Moves geode-lucene tests into new source sets. new 76ad7b4 GEODE-5363: Moves geode-assembly tests into new source sets. new 809792f GEODE-5363: Moves geode-modules tests into new source sets. new c391aa6 GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets. new c90d7e7 GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets. new 3fd9c3f GEODE-5363: Moves geode-modules-session tests into new source sets. new 62e0e72 GEODE-5363: Moves geode-web-api tests into new source sets. new ad28899 GEODE-5363: Moves geode-web tests into new source sets. new c3a8ec6 GEODE-5363: Moves geode-rebalancer tests into new source sets. new dbdd63b GEODE-5363: Moves geode-protobuf tests into new source sets. new 79a48be GEODE-5363: Moves geode-experimental-driver tests into new source sets. new 10ecd0a GEODE-5363: Moves geode-old-client-support tests into new source sets. new 3ab17cb GEODE-5363: Cleanup dependencies and format. new 8bebc44 GEODE-5363: Don't use UnitTest category to run unit tests. new 580cb2c GEODE-5363: Remove UnitTest category from unit tests. new c4a5128 GEODE-5363: Cleanup unit tests. new 3a3331e GEODE-5363: Run integration tests from new source set. new 352d4ab GEODE-5363: Move codeAnalysis resources to integrationTest new 76614c8 GEODE-5363: Removes IntegrationTest category. new 6d7ecaf GEODE-5363: Fixes tomcat tests. new 836dccd GEODE-5363: Ignore inner classes. new 4951855 GEODE-5363: Cleanup new 9368439 GEODE-5363: Fixes tomcat tests. new 4523d8d GEODE-5363: Allow parallel tests. new e2383f3 GEODE-5363: Rebase cleanup. new 4dd085a GEODE-5363: Run distributed tests from new sourceSet new 042d7ac GEODE-5363: Removes DistributedTest category. new 2cd9583 GEODE-5363: Run acceptanceTest from new source set. new 02d42d1 GEODE-5363: Remove acceptanceTest category new 011a66a GEODE-5363: Remove parallel changes. new bd5ceda GEODE-5363: Remove category filter. new 05d2560 GEODE-5363: Run uiTests from new source set. new a01271b GEODE-5363: Rebase cleanup The 46 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 38/46: GEODE-5363: Rebase cleanup.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e2383f3ee640b927d0227d89e4d107edd953e0b8
Author: Jacob Barrett
AuthorDate: Mon Jul 9 19:16:55 2018 -0700
GEODE-5363: Rebase cleanup.
---
.../org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java | 3 ---
.../java/org/apache/geode/cache30/GlobalLockingDUnitTest.java | 0
.../apache/geode/management/internal/JMXMBeanFederationDUnitTest.java | 0
.../geode/management/internal/MBeanFederationErrorPathDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java | 3 ---
.../org/apache/geode/internal/cache/backup/BackupOperationTest.java| 3 ---
.../org/apache/geode/management/internal/BackupStatusImplTest.java | 3 ---
7 files changed, 12 deletions(-)
diff --git
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
similarity index 99%
rename from
geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
rename to
geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
index faed3fe..d4d5af4 100644
---
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
+++
b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
@@ -38,18 +38,15 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.http.MediaType;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class RestRegionAPIDUnitTest {
@ClassRule
public static ServerStarterRule server = new ServerStarterRule()
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from
geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
index 690fbf0..21b99e4 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
@@ -21,14 +21,11 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionAdvisor;
import org.apache.geode.distributed.internal.DistributionManager;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionDestroyJUnitTest {
private PartitionedRegion partitionedRegion;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
index 6adb998..77d
[geode] 30/46: GEODE-5363: Run integration tests from new source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3a3331e433322b3d773c13b80241279bc0d9f65c
Author: Jacob Barrett
AuthorDate: Mon Jul 9 14:31:54 2018 -0700
GEODE-5363: Run integration tests from new source set.
---
gradle/test.gradle | 14 ++
1 file changed, 14 insertions(+)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index f8c883c..134bae9 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -83,7 +83,21 @@ subprojects {
}
}
+ sourceSets {
+integrationTest {
+ java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+}
+ }
+
task integrationTest(type:Test) {
+testClassesDirs = sourceSets.integrationTest.output.classesDirs
+classpath = sourceSets.integrationTest.runtimeClasspath
+
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.IntegrationTest'
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
[geode] 11/46: GEODE-5363: Moves geode-junit tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4dc60865a08abfaba4f65f1b1272df79b242d43a
Author: Jacob Barrett
AuthorDate: Mon Jul 2 21:42:34 2018 -0700
GEODE-5363: Moves geode-junit tests into new source sets.
---
geode-junit/build.gradle | 16
.../org/apache/geode/test/compiler/JarBuilderTest.java | 0
.../org/apache/geode/test/compiler/JavaCompilerTest.java | 0
.../test/concurrent/FileBasedCountDownLatchTest.java | 0
.../junit/rules/ExecutorServiceRuleIntegrationTest.java | 0
.../geode/test/junit/rules/TemporaryFileRuleTest.java| 0
6 files changed, 16 insertions(+)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index d467f0a..65517e9 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -37,3 +37,19 @@ dependencies {
compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
compile project(":geode-old-versions")
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+}
diff --git
a/geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java
similarity index 100%
rename from
geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java
rename to
geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java
diff --git
a/geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java
similarity index 100%
rename from
geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java
rename to
geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java
diff --git
a/geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
similarity index 100%
rename from
geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
rename to
geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
diff --git
a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
similarity index 100%
rename from
geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
rename to
geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
diff --git
a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
similarity index 100%
rename from
geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
rename to
geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
[geode] 26/46: GEODE-5363: Cleanup dependencies and format.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3ab17cbee478d282ca7444d5eae3f0477f05bb59
Author: Jacob Barrett
AuthorDate: Tue Jul 3 10:05:27 2018 -0700
GEODE-5363: Cleanup dependencies and format.
---
extensions/geode-modules-session/build.gradle | 2 ++
extensions/geode-modules-tomcat7/build.gradle | 2 ++
extensions/geode-modules-tomcat8/build.gradle | 1 +
extensions/geode-modules/build.gradle | 2 ++
geode-assembly/build.gradle | 3 +++
geode-connectors/build.gradle | 2 ++
.../index/IndexTrackingQueryObserverDUnitTest.java| 3 ++-
.../org/apache/geode/cache/query/dunit/TestObject.java| 15 +++
.../cache/query/internal/index/IndexTrackingTestHook.java | 15 +++
.../apache/geode/internal/DataSerializableJUnitTest.java | 8 +++-
10 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index 81adfea..5d455ef 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':extensions/geode-modules-session-internal')
compile project(':geode-core')
diff --git a/extensions/geode-modules-tomcat7/build.gradle
b/extensions/geode-modules-tomcat7/build.gradle
index 63ebdd9..7e5b411 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile(project(':extensions/geode-modules')) {
// Remove everything related to Tomcat 6.x
diff --git a/extensions/geode-modules-tomcat8/build.gradle
b/extensions/geode-modules-tomcat8/build.gradle
index f837fc0..0b82b5b 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
dependencies {
compile(project(':extensions/geode-modules')) {
diff --git a/extensions/geode-modules/build.gradle
b/extensions/geode-modules/build.gradle
index 0986f85..ed007a4 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':geode-core')
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 3d3f469..8319b09 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact;
+evaluationDependsOn(":geode-core")
+
apply plugin: 'distribution'
// disable artifact generation for this project
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f9e4c88..22a265f 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
repositories {
maven {
url 'https://dl.bintray.com/palantir/releases'
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 7992b54..0c2c92f 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -186,7 +186,8 @@ public class IndexTrackingQueryObserverDUnitTest extends
JUnit4CacheTestCase {
Index keyIndex1 = null;
try {
if (create) {
-keyIndex1 = (IndexProtocol)
qs.createIndex(IndexTrackingTestHook.INDEX_NAME, IndexType.FUNCTIONAL, "ID",
+keyIndex1 = (IndexProtocol)
qs.createIndex(IndexTrackingTestHook.INDEX_NAME,
+IndexType.FUNCTIONAL, "ID",
"/portfolio ");
assertNotNull(keyIndex1);
assertTrue(keyIndex1 instanceof PartitionedIndex);
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
index 91b7353..52e0c78 100644
---
a/geode-core/src/in
[geode] 16/46: GEODE-5363: Moves geode-modules tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 809792f4a18a53439c74c83b8521fc263ae5e92f
Author: Jacob Barrett
AuthorDate: Tue Jul 3 06:56:24 2018 -0700
GEODE-5363: Moves geode-modules tests into new source sets.
---
extensions/geode-modules/build.gradle | 22 ++
.../modules/session/Tomcat6SessionsJUnitTest.java | 0
.../modules/util/ModuleFunctionsSecurityTest.java | 0
3 files changed, 22 insertions(+)
diff --git a/extensions/geode-modules/build.gradle
b/extensions/geode-modules/build.gradle
index 9796096..0986f85 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -31,7 +31,29 @@ dependencies {
testRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
testCompile project(path: ':geode-junit')
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
similarity index 100%
rename from
extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
rename to
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
diff --git
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
similarity index 100%
rename from
extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
rename to
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
[geode] 46/46: GEODE-5363: Rebase cleanup
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a01271b385296bad642f54e751371333aaf62fc5
Author: Jacob Barrett
AuthorDate: Wed Jul 11 09:12:46 2018 -0700
GEODE-5363: Rebase cleanup
---
.../cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java | 3 +--
.../cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
similarity index 99%
rename from
geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
rename to
geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
index 2e2dca2..974e5ea 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
+++
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
@@ -58,13 +58,12 @@ import
org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({IntegrationTest.class, LuceneTest.class})
+@Category(LuceneTest.class)
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class LuceneIndexCommandsIntegrationTest {
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
similarity index 99%
rename from
geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
rename to
geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
index 2b3a703..764c9b9 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
+++
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import
org.apache.geode.cache.lucene.internal.repository.serializer.PrimitiveSerializer;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LuceneTest;
-@Category({IntegrationTest.class, LuceneTest.class})
+@Category(LuceneTest.class)
public class LuceneIndexCommandsWithReindexAllowedIntegrationTest
extends LuceneIndexCommandsIntegrationTest {
[geode] 18/46: GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c90d7e7869e61d2d3d6bdf05ec183233753f9d0e
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:05:02 2018 -0700
GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets.
---
extensions/geode-modules-tomcat8/build.gradle | 24 +-
.../geode/modules/session/EmbeddedTomcat8.java | 0
.../modules/session/TestSessionsTomcat8Base.java | 0
.../Tomcat8SessionsClientServerDUnitTest.java | 0
.../modules/session/Tomcat8SessionsDUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep| 0
.../resources/tomcat/temp}/.gitkeep| 0
8 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/extensions/geode-modules-tomcat8/build.gradle
b/extensions/geode-modules-tomcat8/build.gradle
index b60e458..f837fc0 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -50,4 +50,26 @@ dependencies {
}
}
-disableMavenPublishing()
\ No newline at end of file
+disableMavenPublishing()
+
+configurations {
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ distributedTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
rename to
extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml
rename to
extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from
extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep
rename to
extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
diff --git
a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/logs/.gitkeep
b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/temp/.git
[geode] 33/46: GEODE-5363: Fixes tomcat tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6d7ecaf4b5b3b87e23e7e5bc061dd1e7cfa9c160
Author: Jacob Barrett
AuthorDate: Mon Jul 9 16:43:15 2018 -0700
GEODE-5363: Fixes tomcat tests.
---
.../test/java/org/apache/geode/modules/session/TestSessionsBase.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
index 41ecbc4..64ac4c3 100644
---
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
+++
b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
@@ -60,7 +60,7 @@ public abstract class TestSessionsBase {
// Set up the servers we need
public static void setupServer(DeltaSessionManager manager) throws Exception
{
-FileUtils.copyDirectory(Paths.get("..", "resources", "test",
"tomcat").toFile(),
+FileUtils.copyDirectory(Paths.get("..", "resources", "integrationTest",
"tomcat").toFile(),
new File("./tomcat"));
port = AvailablePortHelper.getRandomAvailableTCPPort();
server = new EmbeddedTomcat("/test", port, "JVM-1");
[geode] 22/46: GEODE-5363: Moves geode-rebalancer tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c3a8ec6d2214c7a195a1b89b354f47a11c0720c8
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:18:05 2018 -0700
GEODE-5363: Moves geode-rebalancer tests into new source sets.
---
geode-rebalancer/build.gradle | 21 +
.../util/AutoBalancerIntegrationJUnitTest.java | 0
.../geode/cache/util/AutoBalancerJUnitTest.java | 0
3 files changed, 21 insertions(+)
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index e61f06d..a99ac89 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -28,3 +28,24 @@ dependencies {
}
testCompile project(':geode-junit')
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
b/geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
similarity index 100%
rename from
geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
rename to
geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
diff --git
a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
b/geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
similarity index 100%
rename from
geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
rename to
geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
[geode] 10/46: GEODE-5363: Moves pulse tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9a02153bb89edc18199f4e1ef878eac9fb0dcd88
Author: Jacob Barrett
AuthorDate: Mon Jul 2 21:37:52 2018 -0700
GEODE-5363: Moves pulse tests into new source sets.
---
geode-core/build.gradle| 6 -
geode-pulse/build.gradle | 26 ++
.../controllers/PulseControllerJUnitTest.java | 0
.../tools/pulse/tests/junit/BaseServiceTest.java | 0
.../junit/ClusterSelectedRegionServiceTest.java| 0
.../ClusterSelectedRegionsMemberServiceTest.java | 0
.../tests/junit/MemberGatewayHubServiceTest.java | 0
.../pulse/tests/ui/PulseAnonymousUserTest.java | 0
.../geode/tools/pulse/tests/ui/PulseAuthTest.java | 0
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 0
.../tools/pulse/tests/ui/PulseNoAuthTest.java | 0
11 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 4314da7..499611d 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -287,9 +287,3 @@ dependencies {
tasks.eclipse.dependsOn(generateGrammarSource)
-task integrationTestx(type: Test) {
- useJUnit()
- testClassesDirs = sourceSets.integrationTest.output.classesDirs
- classpath = sourceSets.integrationTest.runtimeClasspath
-}
-
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 21e8df2..605aab7 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -18,6 +18,32 @@ import org.apache.geode.gradle.TestPropertiesWriter
*/
apply plugin: 'war'
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ uiTestCompile.extendsFrom testCompile
+ uiTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+ uiTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/uiTest/java')
+}
+resources.srcDir file('src/uiTest/resources')
+ }
+}
+
dependencies {
compile 'org.springframework:spring-beans:' +
project.'springframework.version'
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
b/geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
similarity index 100%
rename from
geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
rename to
geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
similarity index 100%
rename from
geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
rename to
geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
similarity index 100%
rename from
geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
rename to
geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
similarity index 100%
rename from
geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
rename to
geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
similarity index 100%
rename from
geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
rename to
geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
diff --git
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/test
[geode] 06/46: GEODE-5363: Moves distributed tests into new source set.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit dc3f323e46e548e86ea010e5a72f9e475b0f563e Author: Jacob Barrett AuthorDate: Fri Jun 29 21:59:11 2018 -0700 GEODE-5363: Moves distributed tests into new source set. --- .../org/apache/geode/cache/client/internal/LocatorTestBase.java | 0 .../java/org/apache/geode/cache/query/QueryTestUtils.java | 0 .../apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java | 0 .../org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java | 0 .../java/org/apache/geode/cache30/CacheSerializableRunnable.java | 0 .../java/org/apache/geode/cache30/ClientServerTestCase.java | 0 .../org/apache/geode/internal/cache/DistributedCacheTestCase.java | 0 .../cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java | 0 .../apache/geode/internal/cache/execute/FunctionServiceBase.java | 0 .../cache/execute/FunctionServiceClientAccessorPRBase.java| 0 .../geode/internal/cache/execute/FunctionServiceClientBase.java | 0 .../internal/cache/execute/FunctionServiceClientOnServerBase.java | 0 .../internal/cache/execute/FunctionServicePeerAccessorPRBase.java | 0 .../geode/internal/cache/execute/MyTransactionFunction.java | 0 .../geode/internal/cache/execute/PRClientServerTestBase.java | 0 .../java/org/apache/geode/internal/cache/execute/data/CustId.java | 0 .../org/apache/geode/internal/cache/execute/data/Customer.java| 0 .../java/org/apache/geode/internal/cache/execute/data/Order.java | 0 .../org/apache/geode/internal/cache/execute/data/OrderId.java | 0 .../org/apache/geode/internal/cache/execute/data/Shipment.java| 0 .../org/apache/geode/internal/cache/execute/data/ShipmentId.java | 0 .../geode/internal/cache/functions/DistributedRegionFunction.java | 0 .../org/apache/geode/internal/cache/functions/TestFunction.java | 0 .../cache/partitioned/PersistentPartitionedRegionTestBase.java| 0 .../internal/cache/persistence/PersistentReplicatedTestBase.java | 0 .../geode/internal/cache/tier/sockets/CacheServerTestUtil.java| 0 .../internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java | 0 .../geode/internal/cache/versions/RegionVersionVectorTest.java| 0 .../geode/management/internal/configuration/ClusterConfig.java| 0 .../internal/configuration/SharedConfigurationTestUtils.java | 0 .../org/apache/geode/security/ClientAuthenticationTestCase.java | 0 .../org/apache/geode/security/ClientAuthenticationTestUtils.java | 0 .../org/apache/geode/security/ClientAuthorizationTestCase.java| 0 .../java/org/apache/geode/security/SecurityTestUtils.java | 0 .../geode/security/generator/LdapUserCredentialGenerator.java | 0 .../java/org/apache/geode/security/query/QuerySecurityBase.java | 0 .../java/org/apache/geode/test/junit/rules/GfshCommandRule.java | 0 .../org/apache/geode/test/junit/rules/LocatorStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/MemberStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/ServerStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/VMProvider.java| 0 .../java/org/apache/geode/internal/DataSerializableJUnitTest.java | 8 +--- 42 files changed, 1 insertion(+), 7 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java rename to geode-core
[geode] 34/46: GEODE-5363: Ignore inner classes.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 836dccd199b6b462bd0cb3765d54176dfc5b3c6c
Author: Jacob Barrett
AuthorDate: Mon Jul 9 16:47:13 2018 -0700
GEODE-5363: Ignore inner classes.
---
geode-junit/build.gradle | 5 +
.../geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java | 1 +
2 files changed, 6 insertions(+)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 560cb42..e3c2268 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -58,3 +58,8 @@ test {
// Some tests have inner tests that should be ignored
exclude "**/*\$*.class"
}
+
+integrationTest {
+ // Some tests have inner tests that should be ignored
+ exclude "**/*\$*.class"
+}
diff --git
a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
index 5458d15..d13d4c2 100644
---
a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
+++
b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ExecutorService;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.Result;
[geode] 12/46: GEODE-5363: Moves geode-wan tests into new source sets.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit a21d027ee351fdfb32a1a1b899b664fe9a7c7a8e Author: Jacob Barrett AuthorDate: Mon Jul 2 21:58:49 2018 -0700 GEODE-5363: Moves geode-wan tests into new source sets. --- geode-wan/build.gradle | 34 ++ .../geode/cache/CacheXml70GatewayDUnitTest.java| 0 .../geode/cache/CacheXml80GatewayDUnitTest.java| 0 ...tewayReceiverAutoConnectionSourceDUnitTest.java | 0 .../cache/wan/WANRollingUpgradeDUnitTest.java | 0 .../internal/cache/UpdateVersionDUnitTest.java | 0 ...ueueOverflowMBeanAttributesDistributedTest.java | 0 .../cache/wan/CacheClientNotifierDUnitTest.java| 0 .../GatewayLegacyAuthenticationRegressionTest.java | 0 .../cache/wan/GatewayReceiverMBeanDUnitTest.java | 0 ...nderOverflowMBeanAttributesDistributedTest.java | 0 .../cache/wan/Simple2CacheServerDUnitTest.java | 0 .../geode/internal/cache/wan/WANTestBase.java | 0 .../ConcurrentParallelGatewaySenderDUnitTest.java | 0 ...rrentParallelGatewaySenderOffHeapDUnitTest.java | 0 ...ParallelGatewaySenderOperation_1_DUnitTest.java | 0 ...ParallelGatewaySenderOperation_2_DUnitTest.java | 0 ...rentSerialGatewaySenderOperationsDUnitTest.java | 0 ...ialGatewaySenderOperationsOffHeapDUnitTest.java | 0 .../ConcurrentWANPropagation_1_DUnitTest.java | 0 .../ConcurrentWANPropagation_2_DUnitTest.java | 0 .../cache/wan/disttx/DistTXWANDUnitTest.java | 0 .../misc/CommonParallelGatewaySenderDUnitTest.java | 0 ...ommonParallelGatewaySenderOffHeapDUnitTest.java | 0 .../KeepEventsOnGatewaySenderQueueDUnitTest.java | 0 .../NewWANConcurrencyCheckForDestroyDUnitTest.java | 0 .../wan/misc/NewWanAuthenticationDUnitTest.java| 0 .../cache/wan/misc/PDXNewWanDUnitTest.java | 0 ...atedRegion_ParallelWANPersistenceDUnitTest.java | 0 ...atedRegion_ParallelWANPropagationDUnitTest.java | 0 .../misc/SenderWithTransportFilterDUnitTest.java | 0 ...hutdownAllPersistentGatewaySenderDUnitTest.java | 0 .../cache/wan/misc/WANLocatorServerDUnitTest.java | 0 .../internal/cache/wan/misc/WANSSLDUnitTest.java | 0 .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 0 .../cache/wan/misc/WanValidationsDUnitTest.java| 0 ...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 0 ...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 0 ...lelGatewaySenderOperationsOffHeapDUnitTest.java | 0 ...GatewaySenderQueueOverflowOffHeapDUnitTest.java | 0 .../ParallelWANConflationOffHeapDUnitTest.java | 0 ...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 0 ...ANPropagationConcurrentOpsOffHeapDUnitTest.java | 0 .../ParallelWANPropagationOffHeapDUnitTest.java| 0 .../SerialGatewaySenderQueueOffHeapDUnitTest.java | 0 ...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 0 .../SerialWANPropagationOffHeapDUnitTest.java | 0 ...pagation_PartitionedRegionOffHeapDUnitTest.java | 0 ...ParallelGatewaySenderOperation_2_DUnitTest.java | 0 .../ParallelGatewaySenderOperationsDUnitTest.java | 0 ...arallelGatewaySenderQueueOverflowDUnitTest.java | 0 .../parallel/ParallelWANConflationDUnitTest.java | 0 ...ANPersistenceEnabledGatewaySenderDUnitTest.java | 0 ...arallelWANPropagationClientServerDUnitTest.java | 0 ...rallelWANPropagationConcurrentOpsDUnitTest.java | 0 .../parallel/ParallelWANPropagationDUnitTest.java | 0 .../ParallelWANPropagationLoopBackDUnitTest.java | 0 .../wan/parallel/ParallelWANStatsDUnitTest.java| 0 .../cache/wan/serial/GatewayReceiverDUnitTest.java | 0 ...lGatewaySenderDistributedDeadlockDUnitTest.java | 0 .../SerialGatewaySenderEventListenerDUnitTest.java | 0 .../SerialGatewaySenderOperationsDUnitTest.java| 0 .../serial/SerialGatewaySenderQueueDUnitTest.java | 0 .../wan/serial/SerialWANConflationDUnitTest.java | 0 ...ANPersistenceEnabledGatewaySenderDUnitTest.java | 0 .../wan/serial/SerialWANPropagationDUnitTest.java | 0 .../SerialWANPropagationLoopBackDUnitTest.java | 0 ...lWANPropagation_PartitionedRegionDUnitTest.java | 0 .../SerialWANPropagationsFeatureDUnitTest.java | 0 .../cache/wan/serial/SerialWANStatsDUnitTest.java | 0 ...CreateDestroyGatewaySenderCommandDUnitTest.java | 0 .../CreateGatewayReceiverCommandDUnitTest.java | 0 .../DestroyGatewayReceiverCommandDUnitTest.java| 0 .../DestroyGatewaySenderCommandDUnitTest.java | 0 .../PauseGatewaySenderCommandDUnitTest.java| 0 .../ResumeGatewaySenderCommandDUnitTest.java | 0 .../StartGatewayReceiverCommandDUnitTest.java | 0 .../StartGatewaySenderCommandDUnitTest.java| 0 .../StatusGatewayReceiverCommandDUnitTest.java | 0 .../StatusGatewaySenderCommandDUnitTest.java | 0 .../StopGatewayReceiverCommandDUnitTest.java |
[geode] 14/46: GEODE-5363: Moves geode-lucene tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4b41ef6de727536c55c9955d553b5bc2eef0b707
Author: Jacob Barrett
AuthorDate: Mon Jul 2 22:19:54 2018 -0700
GEODE-5363: Moves geode-lucene tests into new source sets.
---
geode-lucene/build.gradle | 44 ++
.../geode/cache/lucene/EvictionDUnitTest.java | 0
.../geode/cache/lucene/ExpirationDUnitTest.java| 0
.../lucene/LuceneClientSecurityDUnitTest.java | 0
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0
.../lucene/LuceneCommandsSecurityDUnitTest.java| 0
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0
.../apache/geode/cache/lucene/LuceneDUnitTest.java | 0
.../cache/lucene/LuceneIndexCreationDUnitTest.java | 0
.../LuceneIndexCreationOnFixedPRDUnitTest.java | 0
.../cache/lucene/LuceneIndexDestroyDUnitTest.java | 0
.../cache/lucene/LuceneQueriesAccessorBase.java| 0
.../cache/lucene/LuceneQueriesClientDUnitTest.java | 0
.../geode/cache/lucene/LuceneQueriesDUnitTest.java | 0
.../LuceneQueriesReindexClientDUnitTest.java | 0
.../lucene/LuceneQueriesReindexDUnitTest.java | 0
...hRegionCreatedBeforeReindexClientDUnitTest.java | 0
...iesWithRegionCreatedBeforeReindexDUnitTest.java | 0
...eriesWithReindexFlagEnabledClientDUnitTest.java | 0
...ceneQueriesWithReindexFlagEnabledDUnitTest.java | 0
.../LuceneSearchWithRollingUpgradeDUnit.java | 0
...hRollingUpgradeReindexFlagEnabledDUnitTest.java | 0
.../cache/lucene/MixedObjectIndexDUnitTest.java| 0
.../geode/cache/lucene/PaginationDUnitTest.java| 0
.../geode/cache/lucene/RebalanceDUnitTest.java | 0
.../lucene/RebalanceWithRedundancyDUnitTest.java | 0
...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 0
.../LuceneClusterConfigurationDUnitTest.java | 0
...onWhereRegionCreatedBeforeReindexDUnitTest.java | 0
...ClusterConfigurationWithReindexFlagEnabled.java | 0
.../management/LuceneManagementDUnitTest.java | 0
.../cache/lucene/test/LuceneTestUtilities.java | 0
.../lucene/LuceneIndexCreationIntegrationTest.java | 0
.../LuceneIndexCreationOffHeapIntegrationTest.java | 0
...eneIndexCreationPersistenceIntegrationTest.java | 0
.../LuceneIndexMaintenanceIntegrationTest.java | 0
.../cache/lucene/LuceneQueriesIntegrationTest.java | 0
.../LuceneQueriesPersistenceIntegrationTest.java | 0
...hRegionCreatedBeforeReindexIntegrationTest.java | 0
...eriesWithReindexFlagEnabledIntegrationTest.java | 0
.../NestedObjectSeralizerIntegrationTest.java | 0
.../internal/LuceneServiceImplIntegrationTest.java | 0
.../DumpDirectoryFilesIntegrationTest.java | 0
.../repository/IndexRepositoryImplJUnitTest.java | 0
...uceneIndexXmlGeneratorIntegrationJUnitTest.java | 0
...onCreatedBeforeReindexIntegrationJUnitTest.java | 0
...WithReindexFlagEnabledIntegrationJUnitTest.java | 0
.../LuceneIndexXmlParserIntegrationJUnitTest.java | 0
.../lucene/test/LuceneFunctionSecurityTest.java| 0
.../AnalyzeLuceneSerializablesJUnitTest.java | 0
.../IndexRepositoryImplPerformanceTest.java| 0
.../repository/LuceneIndexMemoryOverheadTest.java | 2 +-
.../cache/lucene/test/LuceneTestUtilities.java | 23 ---
53 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index f86eb5d..95c7416 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -35,10 +35,54 @@ dependencies {
testCompile 'com.pholser:junit-quickcheck-core:' +
project.'junit-quickcheck.version'
testCompile 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
testCompile 'com.pholser:junit-quickcheck-generators:' +
project.'junit-quickcheck.version'
+// TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+configurations {
+integrationTestCompile.extendsFrom testCompile
+integrationTestRuntime.extendsFrom testRuntime
+distributedTestCompile.extendsFrom testCompile
+distributedTestRuntime.extendsFrom testRuntime
+performanceTestCompile.extendsFrom testCompile
+performanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+integrationTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+}
+distributedTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/d
[geode] 31/46: GEODE-5363: Move codeAnalysis resources to integrationTest
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit 352d4abec3dab7d0c4d0e1f9199e304e9a2a1876 Author: Jacob Barrett AuthorDate: Mon Jul 9 15:20:01 2018 -0700 GEODE-5363: Move codeAnalysis resources to integrationTest --- .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../integrationTest}/resources/org/apache/geode/codeAnalysis/openBugs.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../integrationTest}/resources/org/apache/geode/codeAnalysis/openBugs.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 .../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0 .../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0 .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt similarity index 100% rename from geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt rename to geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt diff --git a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt similarity index 100% rename from geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt rename to geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt similarity index 100% rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt similarity index 100% rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt similarity index 100% rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt similarity index 100% rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt rename to geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt similarity index 100% rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt rename to geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt similarity index 100% rename from geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables
[geode] 27/46: GEODE-5363: Don't use UnitTest category to run unit tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8bebc44250cf456e759369741d30a72792532713
Author: Jacob Barrett
AuthorDate: Tue Jul 3 13:58:25 2018 -0700
GEODE-5363: Don't use UnitTest category to run unit tests.
---
geode-junit/build.gradle | 5 +
gradle/test.gradle | 4
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 65517e9..560cb42 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -53,3 +53,8 @@ sourceSets {
resources.srcDir file('src/integrationTest/resources')
}
}
+
+test {
+ // Some tests have inner tests that should be ignored
+ exclude "**/*\$*.class"
+}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 18ce11b..4f267dc 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -102,10 +102,6 @@ subprojects {
}
test {
-useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.UnitTest'
-}
-
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
[geode] 01/46: GEODE-5363: Creates integration test source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit eb6aae0c1bbbf67295ac8d2b12ece533069a5e64
Author: Jacob Barrett
AuthorDate: Fri Jun 29 14:06:50 2018 -0700
GEODE-5363: Creates integration test source set.
---
geode-core/build.gradle | 15 +++
1 file changed, 15 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index d409e1e..f8a0c5d 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -31,6 +31,8 @@ sourceSets {
configurations {
//declaring new configuration that will be used to associate with artifacts
archives
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
}
dependencies {
@@ -161,6 +163,11 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
+
+
+ // Integration Tests
+
+
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -172,6 +179,14 @@ sourceSets {
test {
output.dir(generatedResources, builtBy: 'createVersionPropertiesFile')
}
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
}
jmh {
[geode] 17/46: GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c391aa6cd71a88d74b313aaa31aa6e4f28e46909
Author: Jacob Barrett
AuthorDate: Tue Jul 3 06:59:53 2018 -0700
GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets.
---
extensions/geode-modules-tomcat7/build.gradle | 21 +
.../modules/session/Tomcat7SessionsJUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep | 0
.../resources/tomcat/temp}/.gitkeep | 0
5 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-tomcat7/build.gradle
b/extensions/geode-modules-tomcat7/build.gradle
index 21096f9..63ebdd9 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -49,3 +49,24 @@ dependencies {
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
b/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
rename to
extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
diff --git
a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml
b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from
extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml
rename to
extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
diff --git
a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep
b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from
extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep
rename to
extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
diff --git
a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep
b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from
extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep
rename to
extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep
[geode] 19/46: GEODE-5363: Moves geode-modules-session tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3fd9c3fc4bdf92cfc654936e7a9304b2a79162a6
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:07:44 2018 -0700
GEODE-5363: Moves geode-modules-session tests into new source sets.
---
extensions/geode-modules-session/build.gradle | 21 +
.../session/installer/InstallerJUnitTest.java | 0
.../session/internal/filter/AbstractListener.java | 0
.../session/internal/filter/BasicServlet.java | 0
.../modules/session/internal/filter/Callback.java | 0
.../session/internal/filter/CallbackServlet.java| 0
.../session/internal/filter/CommonTests.java| 0
.../filter/HttpSessionAttributeListenerImpl.java| 0
.../filter/HttpSessionBindingListenerImpl.java | 0
.../session/internal/filter/MyServletTester.java| 0
.../session/internal/filter/RendezvousManager.java | 0
.../filter/ServletRequestAttributeListenerImpl.java | 0
.../internal/filter/ServletRequestListenerImpl.java | 0
.../SessionReplicationIntegrationJUnitTest.java | 0
.../filter/SessionReplicationJUnitTest.java | 0
.../SessionReplicationLocalCacheJUnitTest.java | 0
.../session/junit/ChildFirstClassLoader.java| 0
.../geode/modules/session/junit/NamedRunner.java| 0
.../session/junit/PerTestClassLoaderRunner.java | 0
.../resources/log4j.properties | 0
.../session/installer/InstallerJUnitTest.web.xml| 0
.../installer/InstallerJUnitTest.web.xml.expected | 0
22 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index 0469070..81adfea 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -42,3 +42,24 @@ jar {
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
similarity index 100%
rename from
extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
rename to
extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
similarity index 100%
rename from
extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
rename to
extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
similarity index 100%
rename from
extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
rename to
extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
similarity index 100%
rename from
extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
rename to
extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CallbackServ
[geode] 07/46: GEODE-5363: Moves distributed tests into new source set.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit 1f4b251d84607705b7f17a2b1fead4101828627b Author: Jacob Barrett AuthorDate: Mon Jul 2 09:06:52 2018 -0700 GEODE-5363: Moves distributed tests into new source set. --- .../geode/cache30/CacheListenerTestCase.java | 0 .../apache/geode/cache30/CacheLoaderTestCase.java | 0 .../org/apache/geode/cache30/CacheTestCase.java| 0 .../apache/geode/cache30/CacheWriterTestCase.java | 0 .../apache/geode/cache30/CacheXml66DUnitTest.java | 0 .../org/apache/geode/cache30/CacheXmlTestCase.java | 0 .../cache30/CertifiableTestCacheListener.java | 0 .../DiskDistributedNoAckRegionTestCase.java| 0 .../apache/geode/cache30/DiskRegionTestImpl.java | 0 ...tedMulticastRegionWithUDPSecurityDUnitTest.java | 0 .../geode/cache30/MultiVMRegionTestCase.java | 0 .../geode/cache30/RegionAttributesTestCase.java| 0 .../geode/cache30/RegionReliabilityTestCase.java | 0 .../org/apache/geode/cache30/RegionTestCase.java | 0 .../apache/geode/cache30/ReliabilityTestCase.java | 0 .../apache/geode/cache30/TestCacheCallback.java| 0 .../apache/geode/cache30/TestCacheListener.java| 0 .../org/apache/geode/cache30/TestCacheLoader.java | 0 .../org/apache/geode/cache30/TestCacheWriter.java | 0 .../geode/cache30/TestTransactionListener.java | 0 ...titionedBackupPrepareAndFinishMsgDUnitTest.java | 0 .../cache/execute/CustomerIDPartitionResolver.java | 0 .../geode/internal/cache/execute/PerfFunction.java | 0 .../internal/cache/execute/PerfTxFunction.java | 0 .../fixed/CustomerFixedPartitionResolver.java | 0 .../fixed/FixedPartitioningTestBaseJUnitTest.java | 0 .../geode/internal/jta/dunit/CommitThread.java | 0 .../geode/internal/jta/dunit/RollbackThread.java | 0 .../geode/internal/offheap/OffHeapRegionBase.java | 0 .../org/apache/geode/management/MBeanUtil.java | 0 .../geode/management/ManagementTestBase.java | 0 .../geode/management/ManagementTestRule.java | 0 .../internal/cli/commands/CliCommandTestBase.java | 0 .../configuration/ClusterConfigTestBase.java | 0 .../generator/AuthzCredentialGenerator.java| 0 .../security/generator/CredentialGenerator.java| 0 .../generator/DummyAuthzCredentialGenerator.java | 0 .../generator/DummyCredentialGenerator.java| 0 .../generator/PKCSCredentialGenerator.java | 0 .../security/generator/SSLCredentialGenerator.java | 0 .../UserPasswordWithExtraPropsAuthInit.java| 0 .../generator/XmlAuthzCredentialGenerator.java | 0 .../geode/internal/DataSerializableJUnitTest.java | 8 +-- .../cache/CustomerIDPartitionResolver.java | 76 -- .../geode/internal/cache/execute/data/CustId.java | 0 .../geode/internal/cache/execute/data/OrderId.java | 0 .../internal/cache/execute/data/ShipmentId.java| 0 .../DescribeDiskStoreFunctionJUnitTest.java| 11 48 files changed, 4 insertions(+), 91 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java rena
[geode] 09/46: GEODE-5363: Moves performance tests into new source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 87623b1553034afa19698d6fcab9e1a107ad9d8b
Author: Jacob Barrett
AuthorDate: Mon Jul 2 17:34:52 2018 -0700
GEODE-5363: Moves performance tests into new source set.
---
geode-core/build.gradle | 16
.../process/BaseProcessStreamReaderIntegrationTest.java | 0
.../query/BaseLineAndCompareQueryPerfJUnitTest.java | 0
.../diskPerf/DiskRegionPerfJUnitPerformanceTest.java | 0
.../cache/snapshot/GFSnapshotJUnitPerformanceTest.java | 0
.../logging/LogWriterDisabledPerformanceTest.java| 0
.../geode/internal/logging/LogWriterPerformanceTest.java | 0
.../logging/log4j/Log4J2DisabledPerformanceTest.java | 0
.../internal/logging/log4j/Log4J2PerformanceTest.java| 0
.../log4j/LogWriterLoggerDisabledPerformanceTest.java| 0
.../logging/log4j/LogWriterLoggerPerformanceTest.java| 0
11 files changed, 16 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index b404df5..4314da7 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -35,6 +35,8 @@ configurations {
integrationTestRuntime.extendsFrom testRuntime
distributedTestCompile.extendsFrom integrationTestCompile
distributedTestRuntime.extendsFrom integrationTestRuntime
+ performanceTestCompile.extendsFrom testCompile
+ performanceTestRuntime.extendsFrom testRuntime
}
dependencies {
@@ -193,6 +195,14 @@ sourceSets {
}
resources.srcDir file('src/distributedTest/resources')
}
+ performanceTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/performanceTest/java')
+}
+resources.srcDir file('src/performanceTest/resources')
+ }
}
jmh {
@@ -277,3 +287,9 @@ dependencies {
tasks.eclipse.dependsOn(generateGrammarSource)
+task integrationTestx(type: Test) {
+ useJUnit()
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
+
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
b/geode-core/src/performanceTest/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
rename to
geode-core/src/performanceTest/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
b/geode-core/src/performanceTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
rename to
geode-core/src/performanceTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
b/geode-core/src/performanceTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
rename to
geode-core/src/performanceTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
rename to
geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerform
[geode] 25/46: GEODE-5363: Moves geode-old-client-support tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 10ecd0a431c8be9035f85f4cd08e0f22f7b694ac
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:30:31 2018 -0700
GEODE-5363: Moves geode-old-client-support tests into new source sets.
---
geode-connectors/build.gradle | 46 ++
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 0
.../geode/connectors/jdbc/JdbcDistributedTest.java | 0
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 0
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 0
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 0
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 0
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 0
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 0
.../PostgresJdbcAsyncWriterIntegrationTest.java| 0
.../jdbc/PostgresJdbcDistributedTest.java | 0
.../jdbc/PostgresJdbcLoaderIntegrationTest.java| 0
.../jdbc/PostgresJdbcWriterIntegrationTest.java| 0
.../MySqlTableMetaDataManagerIntegrationTest.java | 0
...ostgresTableMetaDataManagerIntegrationTest.java | 0
.../TableMetaDataManagerIntegrationTest.java | 0
.../cli/AlterConnectionCommandDUnitTest.java | 0
.../internal/cli/AlterMappingCommandDUnitTest.java | 0
.../cli/CreateConnectionCommandDUnitTest.java | 0
.../cli/CreateMappingCommandDUnitTest.java | 0
.../cli/DescribeConnectionCommandDUnitTest.java| 0
.../cli/DescribeMappingCommandDUnitTest.java | 0
.../cli/DestroyConnectionCommandDUnitTest.java | 0
.../cli/DestroyMappingCommandDunitTest.java| 0
.../cli/JdbcClusterConfigDistributedTest.java | 0
.../cli/ListConnectionCommandDUnitTest.java| 0
.../internal/cli/ListMappingCommandDUnitTest.java | 0
.../AnalyzeConnectorsSerializablesJUnitTest.java | 0
.../cli/AlterConnectionCommandIntegrationTest.java | 0
.../cli/AlterMappingCommandIntegrationTest.java| 0
.../CreateConnectionCommandIntegrationTest.java| 0
.../cli/CreateMappingCommandIntegrationTest.java | 0
.../DestroyConnectionCommandIntegrationTest.java | 0
.../cli/DestroyMappingCommandIntegrationTest.java | 0
.../cli/JDBCConnectorFunctionsSecurityTest.java| 0
geode-old-client-support/build.gradle | 22 +++
.../gemfire/ClientDataSerializableObject.java | 0
.../gemfire/ClientPDXSerializableObject.java | 0
.../gemstone/gemfire/ClientSerializableObject.java | 0
.../apache/geode/ClientDataSerializableObject.java | 0
.../apache/geode/ClientPDXSerializableObject.java | 0
.../org/apache/geode/ClientSerializableObject.java | 0
.../apache/geode/OldClientSupportDUnitTest.java| 0
43 files changed, 68 insertions(+)
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index c5423b9..f9e4c88 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -41,4 +41,50 @@ dependencies {
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+configurations {
+integrationTestCompile.extendsFrom testCompile
+integrationTestRuntime.extendsFrom testRuntime
+distributedTestCompile.extendsFrom testCompile
+distributedTestRuntime.extendsFrom testRuntime
+acceptanceTestCompile.extendsFrom testCompile
+acceptanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+integrationTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+}
+distributedTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+}
+acceptanceTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/acceptanceTest/java')
+}
+resources.srcDir file('src/acceptanceTest/resources')
+}
+}
+
+dependencies {
+// TODO build - move dunit framework to shared module.
+integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+acceptanceTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+acceptanceTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
integrationTest.forkEvery 0
+
diff
[geode] 03/46: GEODE-5363: Creates distributed test source set.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e1fa87ed1809f58eff7752a05704e6675b0caf5c
Author: Jacob Barrett
AuthorDate: Fri Jun 29 20:13:59 2018 -0700
GEODE-5363: Creates distributed test source set.
---
geode-core/build.gradle | 10 ++
1 file changed, 10 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index f8a0c5d..97e983e 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -33,6 +33,8 @@ configurations {
archives
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom integrationTestCompile
+ distributedTestRuntime.extendsFrom integrationTestRuntime
}
dependencies {
@@ -187,6 +189,14 @@ sourceSets {
}
resources.srcDir file('src/integrationTest/resources')
}
+ distributedTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+ }
}
jmh {
[geode] 21/46: GEODE-5363: Moves geode-web tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ad28899f9c7cac0a67ca46610640b2fa9bc25ddb
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:15:58 2018 -0700
GEODE-5363: Moves geode-web tests into new source sets.
---
geode-web/build.gradle | 35 ++
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 0
.../commands/ClusterConfigurationDUnitTest.java| 0
.../cli/commands/CommandOverHttpDUnitTest.java | 0
.../cli/commands/ConnectCommandWithSSLTest.java| 0
.../commands/DescribeConfigCommandDUnitTest.java | 0
...xecuteFunctionCommandWithSecurityDUnitTest.java | 0
.../cli/commands/ExportConfigCommandDUnitTest.java | 0
.../commands/ExportLogsStatsOverHttpDUnitTest.java | 0
.../FunctionCommandsOverHttpDUnitTest.java | 0
.../ListIndexCommandOverHttpDUnitTest.java | 0
.../RebalanceCommandOverHttpDistributedTest.java | 0
.../commands/ShutdownCommandOverHttpDUnitTest.java | 0
.../internal/cli/commands/CommandOverHttpTest.java | 0
.../commands/ConnectCommandIntegrationTest.java| 0
.../commands/ConnectCommandWithSecurityTest.java | 0
.../ExportLogsOverHttpIntegrationTest.java | 0
.../cli/commands/IndexCommandOverHttpTest.java | 0
.../cli/commands/QueryCommandOverHttpTest.java | 0
.../security/GfshCommandsOverHttpSecurityTest.java | 0
.../internal/security/LogNoPasswordTest.java | 0
.../HttpOperationInvokerMBeanOperationTest.java| 0
.../shell/HttpOperationInvokerSecurityTest.java| 0
23 files changed, 35 insertions(+)
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 736fd00..d931535 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -78,6 +78,40 @@ idea.module.iml {
}
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ integrationTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
distributedTest {
dependsOn war
}
@@ -92,3 +126,4 @@ war {
classpath configurations.runtime
classpath project(':geode-core').webJar.archivePath
}
+
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
b/geode-web/src/distributedTest/java/org/apach
[geode] 05/46: GEODE-5363: Moves distributed tests into new source set.
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit fd8e66e84a2b8884854a37989e714106a9324001 Author: Jacob Barrett AuthorDate: Fri Jun 29 21:26:37 2018 -0700 GEODE-5363: Moves distributed tests into new source set. --- .../java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java | 0 .../java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java | 0 .../java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java | 0 .../java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java | 0 .../org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java | 0 .../java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java | 0 .../java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java | 0 .../java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java | 0 .../org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java | 0 .../java/org/apache/geode/cache/query/dunit/QueryAuthorization.java | 0 .../org/apache/geode/distributed/AbstractLauncherServiceStateTest.java| 0 .../java/org/apache/geode/distributed/AbstractLauncherTest.java | 0 .../java/org/apache/geode/distributed/AuthInitializer.java| 0 .../java/org/apache/geode/distributed/DistributedLockBlackboard.java | 0 .../java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java | 0 .../java/org/apache/geode/distributed/DistributedSystemConnectPerf.java | 0 .../java/org/apache/geode/distributed/DistributedSystemJUnitTest.java | 0 .../java/org/apache/geode/distributed/LauncherIntegrationTestCase.java| 0 .../java/org/apache/geode/distributed/LocatorCommand.java | 0 .../java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java | 0 .../org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java | 0 .../geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java | 0 .../java/org/apache/geode/distributed/LocatorLauncherTest.java| 0 .../java/org/apache/geode/distributed/LocatorStateTest.java | 0 .../java/org/apache/geode/distributed/MyAuthenticator.java| 0 .../java/org/apache/geode/distributed/MyPrincipal.java| 0 .../java/org/apache/geode/distributed/ServerCommand.java | 0 .../java/org/apache/geode/distributed/ServerLauncherBuilderTest.java | 0 .../java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java | 0 .../org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java | 0 .../apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java | 0 .../apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java | 0 .../java/org/apache/geode/distributed/ServerLauncherTest.java | 0 .../java/org/apache/geode/distributed/ServerLauncherUtils.java| 0 .../geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java| 0 .../org/apache/geode/distributed/TestServerLauncherCacheProvider.java | 0 .../java/org/apache/geode/distributed/UsesLocatorCommand.java | 0 .../java/org/apache/geode/distributed/UsesServerCommand.java | 0 .../geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java | 0 .../apache/geode/distributed/internal/ClusterDistributionManagerTest.java | 0 .../java/org/apache/geode/distributed/internal/DateMessage.java | 0 .../org/apache/geode/distributed/internal/DistributionAdvisorTest.java| 0 .../apache/geode/distributed/internal/DistributionConfigJUnitTest.java| 0 .../org/apache/geode/distributed/internal/DistributionMessageTest.java| 0 .../distributed/internal/InternalConfigurationPersistenceServiceTest.java | 0 .../java/org/apache/geode/distributed/internal/LDM.java | 0 .../apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java | 0 .../java/org/apache/geode/distributed/internal/ProduceDateMessages.java | 0 .../org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java | 0 .../java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java | 0 .../org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java | 0 .../apache/geode/distributed/internal/StartupMessageDataJUnitTest.java| 0 .../apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java | 0 .../geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java | 0 .../geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java | 0 .../org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java | 0 .../distributed/internal/locks/DLockServiceCharacterizationTests.java | 0 .../geode/distributed/internal/membership/InternalRoleJUnitTest.java | 0 .../apache/geode/distributed/internal/membership/Net
[geode] 35/46: GEODE-5363: Cleanup
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git commit 49518557c5c1726977fc27f7495d2d70d0e9d811 Author: Jacob Barrett AuthorDate: Mon Jul 9 16:53:40 2018 -0700 GEODE-5363: Cleanup --- .../geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java index d13d4c2..5458d15 100644 --- a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java +++ b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.Result;
[geode] 23/46: GEODE-5363: Moves geode-protobuf tests into new source sets.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit dbdd63b4a4eb64173407d69b4f379ecabfeeb611
Author: Jacob Barrett
AuthorDate: Tue Jul 3 07:23:25 2018 -0700
GEODE-5363: Moves geode-protobuf tests into new source sets.
---
geode-protobuf/build.gradle| 45 ++
.../v1/acceptance/CacheConnectionJUnitTest.java| 0
.../CacheConnectionTimeoutJUnitTest.java | 0
.../v1/acceptance/CacheMaxConnectionJUnitTest.java | 0
.../v1/acceptance/CacheOperationsJUnitTest.java| 0
.../LocatorConnectionAuthenticationDUnitTest.java | 0
.../v1/acceptance/LocatorConnectionDUnitTest.java | 0
.../GetAndPutJsonDocumentsDUnitTest.java | 0
.../protobuf/v1/AuthenticationIntegrationTest.java | 0
.../protobuf/v1/AuthorizationIntegrationTest.java | 0
.../v1/DisconnectClientIntegrationTest.java| 0
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 0
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 0
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 0
.../v1/ProtocolVersionIntegrationTest.java | 0
.../v1/ValueSerializerIntegrationTest.java | 0
.../PutIfAbsentRequestIntegrationTest.java | 0
.../PutAllRequestOperationHandlerJUnitTest.java| 3 +-
18 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index f0a0c49..a5cba86 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -30,3 +30,48 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+
+configurations {
+integrationTestCompile.extendsFrom testCompile
+integrationTestRuntime.extendsFrom testRuntime
+distributedTestCompile.extendsFrom testCompile
+distributedTestRuntime.extendsFrom testRuntime
+acceptanceTestCompile.extendsFrom testCompile
+acceptanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+integrationTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/integrationTest/java')
+}
+resources.srcDir file('src/integrationTest/resources')
+}
+distributedTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/distributedTest/java')
+}
+resources.srcDir file('src/distributedTest/resources')
+}
+acceptanceTest {
+java {
+compileClasspath += main.output + test.output
+runtimeClasspath += main.output + test.output
+srcDir file('src/acceptanceTest/java')
+}
+resources.srcDir file('src/acceptanceTest/resources')
+}
+}
+
+dependencies {
+// TODO build - move dunit framework to shared module.
+integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+acceptanceTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+acceptanceTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUni
[geode] branch feature/GEODE-5212 updated: GEODE-5212: Add temporary geode-ci-windows resource
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch feature/GEODE-5212 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-5212 by this push: new f91eb5e GEODE-5212: Add temporary geode-ci-windows resource f91eb5e is described below commit f91eb5ea841efa46c9bbb094538e733bbaa886ba Author: Jens Deppe AuthorDate: Wed Jul 11 06:39:58 2018 -0700 GEODE-5212: Add temporary geode-ci-windows resource Signed-off-by: Dick Cavender --- ci/pipelines/geode-build/base.yml | 146 ++ 1 file changed, 116 insertions(+), 30 deletions(-) diff --git a/ci/pipelines/geode-build/base.yml b/ci/pipelines/geode-build/base.yml index b2154fe..54ac45d 100644 --- a/ci/pipelines/geode-build/base.yml +++ b/ci/pipelines/geode-build/base.yml @@ -47,6 +47,14 @@ resources: source: depth: 1 uri: (( concat "https://github.com/"; metadata.geode-fork "/geode.git" )) +branch: (( grab metadata.geode-build-branch )) +paths: +- ci/* +- name: geode-ci-windows + type: git + source: +depth: 1 +uri: (( concat "https://github.com/"; metadata.geode-fork "/geode.git" )) branch: feature/GEODE-5212 paths: - ci/* @@ -95,7 +103,7 @@ groups: jobs: - Build - UITests -- name: WindowsTests +- name: Windows jobs: - Build - WindowsTests @@ -207,38 +215,116 @@ jobs: - get: geode passed: [Build] trigger: true - - get: geode-ci + - get: geode-ci-windows - get: geode-build-version passed: [Build] -- aggregate: - - task: run-acceptance-tests -tags: [windows] -timeout: 8h -config: - inputs: - - name: geode - - name: geode-ci - - name: geode-build-version - outputs: - - name: built-geode - params: -CALL_STACK_TIMEOUT: 25200 -DUNIT_PARALLEL_FORKS: 0 -MAINTENANCE_VERSION: develop -PARALLEL_DUNIT: false -PUBLIC_BUCKET: ((!public-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) -JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" -DOCKER_COMPOSE_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker-compose.exe" -DOCKER_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker.exe" - platform: windows - run: -path: c:\Progra~1\git\bin\bash.exe -args: - - geode-ci/ci/scripts/test-run.sh - #- :geode-assembly:acceptanceTest :geode-connectors:acceptanceTest +- task: run-acceptance-tests + tags: [windows] + timeout: 8h + config: +inputs: +- name: geode +- name: geode-ci-windows + path: geode-ci +- name: geode-build-version +outputs: +- name: built-geode +params: + CALL_STACK_TIMEOUT: 25200 + DUNIT_PARALLEL_FORKS: 0 + MAINTENANCE_VERSION: develop + PARALLEL_DUNIT: false + PUBLIC_BUCKET: ((!public-bucket)) + SERVICE_ACCOUNT: ((!concourse-gcp-account)) + JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" + DOCKER_COMPOSE_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker-compose.exe" + DOCKER_LOCATION: "C:\\Progra~1\\Docker\\Docker\\resources\\bin\\docker.exe" +platform: windows +run: + path: c:\Progra~1\git\bin\bash.exe + args: +- geode-ci/ci/scripts/test-run.sh +#- :geode-assembly:acceptanceTest :geode-connectors:acceptanceTest +- :geode-assembly:acceptanceTest +- windows-acceptancetestfiles + ensure: +aggregate: +- task: archive-acceptance-test-results + tags: [windows] + config: +inputs: + - name: geode + - name: geode-ci-windows +path: geode-ci + - name: geode-build-version + - name: built-geode +params: + MAINTENANCE_VERSION: (( grab metadata.geode-build-branch )) + SERVICE_ACCOUNT: ((!concourse-gcp-account)) + PUBLIC_BUCKET: ((!public-bucket)) + JAVA_HOME: "C:\\progra~1\\java\\jdk1.8.0_172" +platform: windows +run: + path: c:\Progra~1\git\bin\bash.exe + args: + - geode-ci/ci/scripts/test-archive.sh + - :geode-assembly:acceptanceTest + - windows-acceptancetestfiles +- task: run-integration-tests + tags: [windows] + timeout: 8h + config: +inputs: +- name: geode +- name: geode-ci-windows + path: geode-ci +- name: geode-build-version +outputs: +- name: built-geode +params: + CALL_STACK_TI
