You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/01/12 21:58:02 UTC
geode git commit: fix test failures
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-1930-2 1da22fd7c -> 8d355fe2b
fix test failures
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/8d355fe2
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8d355fe2
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8d355fe2
Branch: refs/heads/feature/GEODE-1930-2
Commit: 8d355fe2b89c07462b991585fe403a10c572a537
Parents: 1da22fd
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Jan 12 13:57:49 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Jan 12 13:57:49 2017 -0800
----------------------------------------------------------------------
.../stats/DistributedSystemStatsDUnitTest.java | 4 +-
.../rules/tests/DistributedTestRuleTest.java | 53 --------------------
.../codeAnalysis/sanctionedSerializables.txt | 10 +---
3 files changed, 4 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/8d355fe2/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
index 63cf88f..5b71b1e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
-@SuppressWarnings("serial")
+@SuppressWarnings({"unused", "serial"})
public class DistributedSystemStatsDUnitTest {
@Manager
@@ -50,7 +50,7 @@ public class DistributedSystemStatsDUnitTest {
private VM[] members;
@Rule
- public ManagementTestRule managementTestRule = ManagementTestRule.builder().build();
+ public ManagementTestRule managementTestRule = ManagementTestRule.builder().start(true).build();
@Test
public void testDistributedSystemStats() throws Exception {
http://git-wip-us.apache.org/repos/asf/geode/blob/8d355fe2/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java
deleted file mode 100644
index 14ed14b..0000000
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.test.dunit.rules.tests;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.serializable.SerializableExternalResource;
-
-// TODO: add assertions to all dunit VMs
-@Category(DistributedTest.class)
-public class DistributedTestRuleTest {
-
- @DistributedRule
- public SimpleRule simpleRule = new SimpleRule();
-
- @Rule
- public DistributedTestRule distributedTestRule = DistributedTestRule.builder().build();
-
- @Test
- public void test() throws Exception {
- System.out.println("KIRK:test");
- }
-
- private static class SimpleRule extends SerializableExternalResource {
- @Override
- protected void before() throws Throwable {
- System.out.println("KIRK:before");
- }
-
- @Override
- protected void after() {
- System.out.println("KIRK:after");
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/8d355fe2/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
index 9626be7..61c139d 100755
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
@@ -482,7 +482,9 @@ org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock,true,-
org/apache/geode/lang/AttachAPINotFoundException,true,-5953162090462085551
org/apache/geode/management/AlreadyRunningException,true,8947734854770335071
org/apache/geode/management/DependenciesNotFoundException,true,9082304929238159814
+org/apache/geode/management/JVMMetrics,false,committedMemory:long,gcCount:long,gcTimeMillis:long,initMemory:long,maxMemory:long,totalThreads:int,usedMemory:long
org/apache/geode/management/ManagementException,true,879398950879472121
+org/apache/geode/management/OSMetrics,false,arch:java/lang/String,availableProcessors:int,committedVirtualMemorySize:long,freePhysicalMemorySize:long,freeSwapSpaceSize:long,maxFileDescriptorCount:long,name:java/lang/String,openFileDescriptorCount:long,processCpuTime:long,systemLoadAverage:double,totalPhysicalMemorySize:long,totalSwapSpaceSize:long,version:java/lang/String
org/apache/geode/management/cli/CommandProcessingException,true,-1398779521639575884,errorData:java/lang/Object,errorType:int
org/apache/geode/management/cli/CommandServiceException,true,7316102209844678329
org/apache/geode/management/cli/Result$Status,false,code:int
@@ -561,7 +563,6 @@ org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction,true
org/apache/geode/management/internal/cli/functions/DestroyIndexFunction,true,1
org/apache/geode/management/internal/cli/functions/ExportConfigFunction,true,1
org/apache/geode/management/internal/cli/functions/ExportDataFunction,true,1
-org/apache/geode/management/internal/cli/functions/ExportSharedConfigurationFunction,true,1
org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction,true,4366812590788342070
org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction$FetchRegionAttributesFunctionResult,true,-3970828263897978845,cacheListenerClasses:java/lang/String[],cacheLoaderClass:java/lang/String,cacheWriterClass:java/lang/String,regionAttributes:org/apache/geode/cache/RegionAttributes
org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction,true,1
@@ -579,14 +580,12 @@ org/apache/geode/management/internal/cli/functions/GetRegionsFunction,true,1
org/apache/geode/management/internal/cli/functions/GetStackTracesFunction,true,1
org/apache/geode/management/internal/cli/functions/GetSubscriptionQueueSizeFunction,true,1
org/apache/geode/management/internal/cli/functions/ImportDataFunction,true,1
-org/apache/geode/management/internal/cli/functions/ImportSharedConfigurationArtifactsFunction,true,1
org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction,true,1
org/apache/geode/management/internal/cli/functions/ListDeployedFunction,true,1
org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction,false
org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction,true,1
org/apache/geode/management/internal/cli/functions/ListFunctionFunction,true,1
org/apache/geode/management/internal/cli/functions/ListIndexFunction,false
-org/apache/geode/management/internal/cli/functions/LoadSharedConfigurationFunction,true,1
org/apache/geode/management/internal/cli/functions/LogFileFunction,true,1
org/apache/geode/management/internal/cli/functions/MemberRegionFunction,true,1
org/apache/geode/management/internal/cli/functions/MembersForRegionFunction,true,8746830191680509335
@@ -625,11 +624,6 @@ org/apache/geode/management/internal/cli/util/MemberInformation,true,1,cacheXmlF
org/apache/geode/management/internal/cli/util/MemberNotFoundException,true,5686788909239181174
org/apache/geode/management/internal/cli/util/VisualVmNotFoundException,true,-8491645604829510102
org/apache/geode/management/internal/configuration/domain/SharedConfigurationStatus,false
-org/apache/geode/management/internal/configuration/functions/AddJarFunction,true,1
-org/apache/geode/management/internal/configuration/functions/AddXmlEntityFunction,true,1
-org/apache/geode/management/internal/configuration/functions/DeleteJarFunction,true,1
-org/apache/geode/management/internal/configuration/functions/DeleteXmlEntityFunction,true,1
-org/apache/geode/management/internal/configuration/functions/ModifyXmlAndPropertiesFunction,true,1
org/apache/geode/management/internal/configuration/functions/UploadJarFunction,true,1
org/apache/geode/management/internal/web/domain/Link,false,href:java/net/URI,method:org/apache/geode/management/internal/web/http/HttpMethod,relation:java/lang/String
org/apache/geode/management/internal/web/domain/QueryParameterSource,true,34131123582155,objectName:javax/management/ObjectName,queryExpression:javax/management/QueryExp