Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 42ECB1861B for ; Tue, 10 Nov 2015 23:42:45 +0000 (UTC) Received: (qmail 33123 invoked by uid 500); 10 Nov 2015 23:42:45 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 33091 invoked by uid 500); 10 Nov 2015 23:42:45 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 33082 invoked by uid 99); 10 Nov 2015 23:42:45 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2015 23:42:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B1BA9C1463 for ; Tue, 10 Nov 2015 23:42:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id R4Tdwvq0GihI for ; Tue, 10 Nov 2015 23:42:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id D21F22F8B2 for ; Tue, 10 Nov 2015 23:42:23 +0000 (UTC) Received: (qmail 30388 invoked by uid 99); 10 Nov 2015 23:42:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2015 23:42:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AFDF0E56F7; Tue, 10 Nov 2015 23:42:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dixie@apache.org To: commits@geode.incubator.apache.org Date: Tue, 10 Nov 2015 23:42:57 -0000 Message-Id: <60555f69df6f46bf913c432b1d56eb00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] incubator-geode git commit: GEODE-12/ GEODE-304 Multiple clean-ups - gradle, JMX beans, test references. GEODE-12/ GEODE-304 Multiple clean-ups - gradle, JMX beans, test references. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0192152c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0192152c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0192152c Branch: refs/heads/feature/GEODE-12 Commit: 0192152c2021f78ff6de7e667ca6df0ba260f65c Parents: 663379e Author: Nitin Lamba Authored: Mon Oct 19 23:20:18 2015 +0530 Committer: Dick Cavender Committed: Tue Nov 10 15:27:32 2015 -0800 ---------------------------------------------------------------------- pulse/build.gradle | 51 +++++------------- .../pulse/internal/data/JMXDataUpdater.java | 7 +-- pulse/src/main/resources/pulse.properties | 6 +-- .../gemfire/tools/pulse/tests/Member.java | 6 ++- .../tools/pulse/tests/PulseAutomatedTests.java | 54 ++++++++++---------- .../tools/pulse/tests/PulseTestData.java | 4 +- .../gemfire/tools/pulse/tests/PulseTests.java | 9 ++-- .../tools/pulse/tests/RegionOnMember.java | 4 +- .../gemfire/tools/pulse/tests/ServerObject.java | 6 +++ .../tools/pulse/tests/ServerObjectMBean.java | 2 + pulse/src/test/resources/test.properties | 15 +++--- 11 files changed, 76 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/build.gradle ---------------------------------------------------------------------- diff --git a/pulse/build.gradle b/pulse/build.gradle index b2bd5fc..fdcb03b 100755 --- a/pulse/build.gradle +++ b/pulse/build.gradle @@ -9,10 +9,7 @@ sourceSets {// Force new dependencies only - do no inherit from parent project } } test { - output.resourcesDir = output.classesDir - resources { - include('**/pulse.properties') - } + runtimeClasspath += fileTree("$projectDir/src/main/resources") } } @@ -38,13 +35,19 @@ dependencies { providedCompile 'org.apache.httpcomponents:httpmime:4.3.3' provided 'org.mortbay.jetty:servlet-api:2.5-20081211' + provided 'com.google.guava:guava:15.0' testCompile 'junit:junit:4.10' testCompile 'org.apache.tomcat.embed:tomcat-embed-core:7.0.30' testCompile 'org.apache.tomcat.embed:tomcat-embed-jasper:7.0.30' testCompile 'org.apache.tomcat.embed:tomcat-embed-logging-juli:7.0.30' - testCompile 'org.seleniumhq.selenium:selenium-server-standalone:2.41.0' -// testCompile 'org.seleniumhq.selenium:selenium-server:2.47.1' + testCompile 'org.seleniumhq.selenium:selenium-firefox-driver:2.47.2' + testCompile 'org.seleniumhq.selenium:selenium-api:2.47.2' + testCompile 'org.seleniumhq.selenium:selenium-remote-driver:2.47.2' + testCompile 'org.seleniumhq.selenium:selenium-support:2.47.2' + + testRuntime 'com.google.code.gson:gson:2.3.1' + testRuntime 'org.apache.commons:commons-exec:1.3' // Required only for creating test categories // testPulseCompile project(path: ':gemfire-junit', configuration: 'testOutput') @@ -80,12 +83,13 @@ war { test { - include '**/junit/*.class' - exclude '**/AllTests.class' - exclude '**/Base*.class' +// Includes all tests in PulseTests, PulseBaseTests & PulseAutomatedTests + include '**/PulseAutomatedTests.class' systemProperty 'pulse.propfile', "$projectDir/src/test/resources/test.properties" systemProperty 'pulse.war', "$buildDir/libs/$pulseWarFile" +// systemProperty 'pulse.propMockDataUpdaterClass', "com.vmware.gemfire.tools.pulse.testbed.PropMockDataUpdater" +// systemProperty 'pulse.updater', "MOCK" useJUnit { // TODO: Classify and add categories to different Pulse tests @@ -99,35 +103,6 @@ test { } -integrationTest { - -// Run tests individually -// include '**/PulseUITest.class' -// include '**/PulseTests.class' -// include '**/PulseAutomatedTests.class' - - include '**/*Tests.class' - include '**/*Test.class' - exclude '**/AllTests.class' - exclude '**/junit/*.class' - exclude '**/Base*.class' - - systemProperty 'pulse.propfile', "$projectDir/src/test/resources/test.properties" - systemProperty 'pulse.war', "$buildDir/libs/$pulseWarFile" - - useJUnit() { - - // TODO: Classify and add categories to different Pulse tests -// includeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest' -// excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest' -// excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest' - - } - // show standard out and standard error of the test JVM(s) on the console - testLogging.showStandardStreams = true - -} - // TODO: Implement checkMissedTests & classify/ add categories to different Pulse tests //This target does not run any tests. Rather, it validates that there are no //tests that are missing a category annotation http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java ---------------------------------------------------------------------- diff --git a/pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java b/pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java index 27aed67..9f7e968 100644 --- a/pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java +++ b/pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java @@ -1547,6 +1547,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { } } + /* GemfireXD related code try{// Added for Rolling upgrade CompositeData compositeData = (CompositeData) (this.mbs.invoke(mbeanName, PulseConstants.MBEAN_OPERATION_LISTREGIONATTRIBUTES, null, null)); @@ -1582,7 +1583,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { region.setCompressionCodec("NA"); // LOGGER.info("Some of the Pulse elements are not available currently. There might be a GemFire upgrade going on."); } - + */ // TODO : Uncomment below code when sql fire mbean attributes are // available @@ -2346,7 +2347,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); } } - + /* GemfireXD related code try{// Added for Rolling upgrade changes. Needs to removed once Rolling upgrade handled gracefully CompositeData compositeData = (CompositeData) (this.mbs.invoke(mbeanName, PulseConstants.MBEAN_OPERATION_LISTREGIONATTRIBUTES, null, null)); @@ -2375,7 +2376,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { } - /*// Remove deleted regions from member's regions list + // Remove deleted regions from member's regions list for (Iterator it = cluster.getDeletedRegions().iterator(); it .hasNext();) { String deletedRegion = it.next(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/main/resources/pulse.properties ---------------------------------------------------------------------- diff --git a/pulse/src/main/resources/pulse.properties b/pulse/src/main/resources/pulse.properties index 17299c2..25c19bc 100644 --- a/pulse/src/main/resources/pulse.properties +++ b/pulse/src/main/resources/pulse.properties @@ -8,9 +8,9 @@ #pulse.host=pnq-pratik.vmware.com #pulse.port=10334 -pulse.useLocator=true -pulse.host=pnq-pratik.vmware.com -pulse.port=10334 +pulse.useLocator=false +pulse.host=localhost +pulse.port=9999 #pulse.useSSL.locator=true #pulse.useSSL.manager=true http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java index 812e055..c1b9987 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java @@ -78,12 +78,14 @@ public class Member extends JMXBaseBean implements MemberMBean { @Override public long getCurrentHeapSize() { - return getLong("currentHeapSize"); +// return getLong("currentHeapSize"); + return getLong("UsedMemory"); } @Override public long getMaximumHeapSize() { - return getLong("maximumHeapSize"); +// return getLong("maximumHeapSize"); + return getLong("MaxMemory"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTests.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTests.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTests.java index 21c14d5..795973b 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTests.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTests.java @@ -144,7 +144,7 @@ class PulseBaseTests extends PulseTests { public void validateServerGroupGridData() { List serverGridRows = driver.findElements(By.xpath("//table[@id='memberListSG']/tbody/tr")); int rowsCount = serverGridRows.size(); - System.out.println(rowsCount); + System.out.println("validateServerGroupGrid: Total Rows = " + rowsCount); String[][] gridDataFromUI = new String[rowsCount][7]; for (int j = 2, x = 0; j <= serverGridRows.size(); j++, x++) { @@ -189,7 +189,7 @@ class PulseBaseTests extends PulseTests { public void validateRedundancyZonesGridData() { List rzGridRows = driver.findElements(By.xpath("//table[@id='memberListRZ']/tbody/tr")); int rowsCount = rzGridRows.size(); - System.out.println(rowsCount); + System.out.println("validateRedundancyZoneGrid: Total Rows = " + rowsCount); String[][] gridDataFromUI = new String[rowsCount][7]; for (int j = 2, x = 0; j <= rzGridRows.size(); j++, x++) { @@ -237,7 +237,7 @@ class PulseBaseTests extends PulseTests { public void validateTopologyGridData() { List rzGridRows = driver.findElements(By.xpath("//table[@id='memberList']/tbody/tr")); int rowsCount = rzGridRows.size(); - System.out.println(rowsCount); + System.out.println("validateTopologyGrid: Total Rows = " + rowsCount); String[][] gridDataFromUI = new String[rowsCount][7]; for (int j = 2, x = 0; j <= rzGridRows.size(); j++, x++) { @@ -272,7 +272,7 @@ class PulseBaseTests extends PulseTests { public void validateDataPrespectiveGridData() { List serverGridRows = driver.findElements(By.xpath("//table[@id='regionsList']/tbody/tr")); int rowsCount = serverGridRows.size(); - System.out.println(rowsCount); + System.out.println("validateDataPerspectiveGrid: Total Rows = " + rowsCount); String[][] gridDataFromUI = new String[rowsCount][7]; for (int j = 2, x = 0; j <= serverGridRows.size(); j++, x++) { @@ -312,7 +312,7 @@ class PulseBaseTests extends PulseTests { public void validateRegionDetailsGridData() { List serverGridRows = driver.findElements(By.xpath("//table[@id='memberList']/tbody/tr")); int rowsCount = serverGridRows.size(); - System.out.println(rowsCount); + System.out.println("validateRegionDetailsGrid: Total Rows = " + rowsCount); String[][] gridDataFromUI = new String[rowsCount][7]; for (int j = 2, x = 0; j <= serverGridRows.size(); j++, x++) { @@ -446,8 +446,8 @@ class PulseBaseTests extends PulseTests { public void verifyElementAttributeById(String id, String attribute, String value) { String actualValue = findElementById(id).getAttribute(attribute); - System.out.println(value); - System.out.println(actualValue); + System.out.println("verifyElementAttributeById: Value = " + value); + System.out.println("verifyElementAttributeById: Actual Value = " + actualValue); Assert.assertTrue(actualValue.equals(value) || actualValue.contains(value)); } @@ -457,7 +457,7 @@ class PulseBaseTests extends PulseTests { Actions action = new Actions(driver); WebElement we = driver.findElement(By.id(id)); action.moveToElement(we).release().perform(); - System.out.println("testing"); + System.out.println("mouseReleaseById: testing..."); } public void mouseClickAndHoldOverElementById(String id) { verifyElementPresentById(id); @@ -519,15 +519,15 @@ class PulseBaseTests extends PulseTests { } for(Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage - String refMemberCPUUsage = null; + String refMemberHeapUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ - refMemberCPUUsage = PulseTestData.Topology.heapUsagePaintStyleM1; + refMemberHeapUsage = PulseTestData.Topology.heapUsagePaintStyleM1; }else if(entry.getValue().equalsIgnoreCase("M2")){ - refMemberCPUUsage = PulseTestData.Topology.heapUsagePaintStyleM2; + refMemberHeapUsage = PulseTestData.Topology.heapUsagePaintStyleM2; }else{ - refMemberCPUUsage = PulseTestData.Topology.heapUsagePaintStyleM3; + refMemberHeapUsage = PulseTestData.Topology.heapUsagePaintStyleM3; } - Assert.assertTrue(findElementById(entry.getValue()).getAttribute("style").contains(refMemberCPUUsage)); + Assert.assertTrue(findElementById(entry.getValue()).getAttribute("style").contains(refMemberHeapUsage)); } } @@ -553,7 +553,7 @@ class PulseBaseTests extends PulseTests { } - public void assertMemeberSortingBySgHeapUsage(){ + public void assertMemberSortingBySgHeapUsage(){ String[] memberNames = JMXProperties.getInstance().getProperty("members").split(" "); HashMap> sgMap = new HashMap>(); for (String member : memberNames) { @@ -594,7 +594,7 @@ class PulseBaseTests extends PulseTests { - public void assertMemeberSortingBySgCpuUsage(){ + public void assertMemberSortingBySgCpuUsage(){ String[] memberNames = JMXProperties.getInstance().getProperty("members").split(" "); HashMap> sgMap = new HashMap>(); for (String member : memberNames) { @@ -633,7 +633,7 @@ class PulseBaseTests extends PulseTests { } } - public void assertMemeberSortingByRzHeapUsage(){ + public void assertMemberSortingByRzHeapUsage(){ String[] memberNames = JMXProperties.getInstance().getProperty("members").split(" "); HashMap> rzMap = new HashMap>(); for (String member : memberNames) { @@ -656,15 +656,15 @@ class PulseBaseTests extends PulseTests { for(Map.Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage - String refMemberCPUUsage = null; + String refMemberHeapUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ - refMemberCPUUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ1RZ2M1; + refMemberHeapUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ1RZ2M1; }else if(entry.getValue().equalsIgnoreCase("M2")){ - refMemberCPUUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ1RZ2M2; + refMemberHeapUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ1RZ2M2; }else{ - refMemberCPUUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ3M3; + refMemberHeapUsage = PulseTestData.RedundancyZone.heapUsagePaintStyleRZ3M3; } - Assert.assertTrue(findElementById("RZ1 RZ2(!)"+entry.getValue()).getAttribute("style").contains(refMemberCPUUsage)); + Assert.assertTrue(findElementById("RZ1 RZ2(!)"+entry.getValue()).getAttribute("style").contains(refMemberHeapUsage)); } } @@ -857,7 +857,7 @@ public class PulseAutomatedTests extends PulseBaseTests { verifyTextPresrntByXpath(PulseTestLocators.TopologyView.hostNameTTXpath, getPropertyValue("member.M" + i + ".host")); verifyTextPresrntByXpath(PulseTestLocators.TopologyView.cpuUsageTTXpath, "0%"); verifyTextPresrntByXpath(PulseTestLocators.TopologyView.memoryUsageTTXpath, getPropertyValue("member.M" + i - + ".currentHeapSize")); + + ".UsedMemory")); verifyTextPresrntByXpath(PulseTestLocators.TopologyView.loadAvgTTXpath, getPropertyValue("member.M" + i + ".loadAverage")); verifyTextPresrntByXpath(PulseTestLocators.TopologyView.soketsTTXpath, getPropertyValue("member.M" + i @@ -1279,19 +1279,19 @@ public class PulseAutomatedTests extends PulseBaseTests { } @Test - public void testSortingUsingCpuUsageOnServerGroupView(){ + public void testSortingUsingHeapUsageOnServerGroupView(){ navigateToServerGroupTreeView(); clickElementUsingId(PulseTestLocators.ServerGroups.hotSpotId); clickElementUsingXpath(PulseTestLocators.ServerGroups.heapUsageXpath); - assertMemeberSortingBySgHeapUsage(); + assertMemberSortingBySgHeapUsage(); } @Test - public void testSortingUsingHeapUsageOnServerGroupView(){ + public void testSortingUsingCpuUsageOnServerGroupView(){ navigateToServerGroupTreeView(); clickElementUsingId(PulseTestLocators.ServerGroups.hotSpotId); clickElementUsingXpath(PulseTestLocators.ServerGroups.cpuUsageXpath); - assertMemeberSortingBySgCpuUsage(); + assertMemberSortingBySgCpuUsage(); } //--- Redundancy Zone view @@ -1336,7 +1336,7 @@ public class PulseAutomatedTests extends PulseBaseTests { navigateToRedundancyZonesTreeView(); clickElementUsingId(PulseTestLocators.RedundancyZone.hotSpotId); clickElementUsingXpath(PulseTestLocators.RedundancyZone.heapUsageXpath); - assertMemeberSortingByRzHeapUsage(); + assertMemberSortingByRzHeapUsage(); } @Test http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTestData.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTestData.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTestData.java index d1a92a2..a7e95b1 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTestData.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTestData.java @@ -84,8 +84,8 @@ public class PulseTestData { public static final String chkRgnClassName = "bttn chk checkbox_true_full"; public static final String notChkRgnClassName = "bttn chk checkbox_false_full"; - public static final String regName = "reg4"; - public static final String query1Text = "select * from /reg1"; + public static final String regName = "R1"; + public static final String query1Text = "select * from /R1"; public static final String datePattern = "EEE, MMM dd yyyy, HH:mm:ss z"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java index b6dd7c6..03379e7 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java @@ -426,7 +426,7 @@ public class PulseTests { .findElement( By.xpath("//table[@id='memberList']/tbody/tr[" + (i + 1) + "]/td[4]")).getText()); Float gridHeapUsagestring = Float.parseFloat(JMXProperties.getInstance() - .getProperty("member.M" + i + ".currentHeapSize")); + .getProperty("member.M" + i + ".UsedMemory")); Assert.assertEquals(gridHeapUsagestring, HeapUsage); } } @@ -533,7 +533,7 @@ public class PulseTests { .format(memberOffHeapUsedSize)); Assert.assertEquals(memberOffHeapUsedSize, OffHeapUsedSize); } - + @Ignore("For Gemfire XD") @Test // conflict between UI and properties file public void testMemberClients() { String Clients = driver.findElement(By.id(MEMBER_VIEW_CLIENTS_ID)) @@ -858,7 +858,8 @@ public class PulseTests { Assert.assertEquals(databrowserColocatedRegion3, DataBrowserColocatedRegion3); } - + + @Ignore("Bad Test") // clusterDetails element not found on Data Browser page. No assertions in test @Test public void testDataBrowserQueryValidation() throws IOException, InterruptedException { loadDataBrowserpage(); @@ -915,7 +916,7 @@ public class PulseTests { .getText(); String MemoryUsageM1 = MemoryUsageM1temp.replaceAll("MB", ""); String memoryUsageM1 = JMXProperties.getInstance().getProperty( - "member.M" + (i) + ".currentHeapSize"); + "member.M" + (i) + ".UsedMemory"); Assert.assertEquals(memoryUsageM1, MemoryUsageM1); String LoadAvgM1 = driver.findElement(By.xpath("//div[@id='_tooltip']/div/div/div[2]/div[" + (j + 2) + "]/div[2]/div")) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java index 7402a8b..2a10a97 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java @@ -58,12 +58,12 @@ public class RegionOnMember extends JMXBaseBean implements RegionOnMemberMBean { @Override public float getDiskGetsRate(){ - return getFloat("diskGetsRate"); + return getFloat("diskReadsRate"); } @Override public float getDiskPutsRate(){ - return getFloat("diskPutsRate"); + return getFloat("diskWritesRate"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java index 97acac7..c2fa54c 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java @@ -62,6 +62,12 @@ public class ServerObject extends NotificationBroadcasterSupport implements } @Override + public String[] listServers() { + return JMXProperties.getInstance() + .getProperty(getKey("listServers"), "").split(" "); + } + + @Override public TabularData viewRemoteClusterStatus() { wanInfo.clear(); String[] wan = JMXProperties.getInstance() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java ---------------------------------------------------------------------- diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java index 9487c0e..bcd41f1 100644 --- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java +++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java @@ -62,5 +62,7 @@ public interface ServerObjectMBean { public String[] listCacheServers(); + public String[] listServers(); + public String queryData(String p0, String p1, int p2); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0192152c/pulse/src/test/resources/test.properties ---------------------------------------------------------------------- diff --git a/pulse/src/test/resources/test.properties b/pulse/src/test/resources/test.properties index fabeea1..42f9792 100644 --- a/pulse/src/test/resources/test.properties +++ b/pulse/src/test/resources/test.properties @@ -7,11 +7,12 @@ gemfirexdmembers=M1 M2 M3 aggregatequeries=Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 Q10 Q11 Q12 Q13 Q14 Q15 Q16 Q17 Q18 Q19 Q20 Q21 Q22 Q23 Q24 Q25 server.S1.listCacheServers=true +server.S1.listServers=M1 M2 M3 server.S1.memberCount=3 server.S1.numClients=2 server.S1.distributedSystemId=1222 server.S1.locatorCount=1 -server.S1.totalRegionCount=2 +server.S1.totalRegionCount=3 server.S1.numRunningFunctions=12 server.S1.registeredCQCount=10 server.S1.numSubscriptions=9 @@ -47,8 +48,8 @@ member.M1.diskWritesRate=23.92 member.M1.JVMPauses=232221 member.M1.currentHeapSize=2322 member.M1.maximumHeapSize=700000 -member.M1.UsedMemory=23232 -member.M1.MaxMemory=710000 +member.M1.UsedMemory=2322 +member.M1.MaxMemory=700000 member.M1.numThreads=4 member.M1.memberUpTime=1123333 member.M1.host=h1 @@ -81,8 +82,8 @@ member.M2.diskWritesRate=23.92 member.M2.JVMPauses=232221 member.M2.currentHeapSize=1322 member.M2.maximumHeapSize=700000 -member.M2.UsedMemory=23232 -member.M2.MaxMemory=710000 +member.M2.UsedMemory=1322 +member.M2.MaxMemory=700000 member.M2.numThreads=3 member.M2.memberUpTime=1123333 member.M2.host=h2 @@ -115,8 +116,8 @@ member.M3.diskWritesRate=23.92 member.M3.JVMPauses=232221 member.M3.currentHeapSize=2312 member.M3.maximumHeapSize=700000 -member.M3.UsedMemory=23232 -member.M3.MaxMemory=710000 +member.M3.UsedMemory=2312 +member.M3.MaxMemory=700000 member.M3.numThreads=4 member.M3.memberUpTime=1123333 member.M3.host=h3