You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/05/23 22:06:53 UTC
incubator-geode git commit: Temporarily adding scripts to convert to
junit4
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-837 45a4ef29f -> 6e386333c
Temporarily adding scripts to convert to junit4
This scripts will convert dunits to junit 4 syntax. They should be
removed before this branch is merged to develop.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6e386333
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6e386333
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6e386333
Branch: refs/heads/feature/GEODE-837
Commit: 6e386333c6eaaf00fa39e45ce787758cf01a5688
Parents: 45a4ef2
Author: Dan Smith <up...@apache.org>
Authored: Mon May 23 15:06:18 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon May 23 15:06:18 2016 -0700
----------------------------------------------------------------------
convert_one_dunit_to_junit4.pl | 27 +++++++++++++
dunits_to_junit4.sh | 28 +++++++++++++
reset_existing_junit4_dunits.sh | 77 ++++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6e386333/convert_one_dunit_to_junit4.pl
----------------------------------------------------------------------
diff --git a/convert_one_dunit_to_junit4.pl b/convert_one_dunit_to_junit4.pl
new file mode 100755
index 0000000..c251ecd
--- /dev/null
+++ b/convert_one_dunit_to_junit4.pl
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w -i -p
+
+use strict;
+
+my $filename = $ARGV;
+$filename =~ s/.*\/(.*).java/$1/;
+
+#Change constructor to a no arg constructor
+s/(public.*$filename)\(String name\)/$1()/;
+s/super\(name\)/super()/;
+
+#Add @Test annotation
+s/^[^\/]*public void test/ \@Test\n public void test/;
+
+#Extend the correct junit 4 class
+s/extends CacheTestCase/extends JUnit4CacheTestCase/;
+s/extends DistributedTestCase/extends JUnit4DistributedTestCase/;
+
+#Add the DistributedTest category
+s/(^public class $filename)/\@Category(DistributedTest.class)\n$1/;
+
+#Change calls to new MyTest("string") to use the no arg constructor
+s/new $filename\(\".*?\"\)/new $filename\(\)/;
+
+#Add imports
+s/^(package com.gemstone.*)/$1\n\nimport org.junit.experimental.categories.Category;\nimport org.junit.Test;\n\nimport static org.junit.Assert.*;\n\nimport com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;\nimport com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;\nimport com.gemstone.gemfire.test.junit.categories.DistributedTest;/
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6e386333/dunits_to_junit4.sh
----------------------------------------------------------------------
diff --git a/dunits_to_junit4.sh b/dunits_to_junit4.sh
new file mode 100755
index 0000000..27a4152
--- /dev/null
+++ b/dunits_to_junit4.sh
@@ -0,0 +1,28 @@
+find . -name *DUnitTest.java -exec ./convert_one_dunit_to_junit4.pl {} \;
+
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckRegionTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
+./convert_one_dunit_to_junit4.pl ./geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+
+./reset_existing_junit4_dunits.sh
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6e386333/reset_existing_junit4_dunits.sh
----------------------------------------------------------------------
diff --git a/reset_existing_junit4_dunits.sh b/reset_existing_junit4_dunits.sh
new file mode 100755
index 0000000..6bbf2a5
--- /dev/null
+++ b/reset_existing_junit4_dunits.sh
@@ -0,0 +1,77 @@
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationPart2DUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4BasicDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4GetDefaultDiskStoreNameDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4GetTestMethodNameDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4VMDUnitTest.java
+git checkout -- ./geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+git checkout -- ./geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRDUnitTest.java
+git checkout -- ./geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPROverflowDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
+git checkout -- ./geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserDurableCQAuthzDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+git checkout -- ./geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
+git checkout -- ./geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java