summaryrefslogtreecommitdiff
path: root/test/c/cutest
diff options
context:
space:
mode:
Diffstat (limited to 'test/c/cutest')
-rw-r--r--test/c/cutest/CuTest.c2
-rw-r--r--test/c/cutest/CuTest.h2
-rw-r--r--test/c/cutest/CuTests.c155
-rw-r--r--test/c/cutest/Runner.c6
4 files changed, 150 insertions, 15 deletions
diff --git a/test/c/cutest/CuTest.c b/test/c/cutest/CuTest.c
index d7da5b22..68e7b6ac 100644
--- a/test/c/cutest/CuTest.c
+++ b/test/c/cutest/CuTest.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
diff --git a/test/c/cutest/CuTest.h b/test/c/cutest/CuTest.h
index 76cbceb4..3163fde0 100644
--- a/test/c/cutest/CuTest.h
+++ b/test/c/cutest/CuTest.h
@@ -1,7 +1,7 @@
/*
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 2012, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
diff --git a/test/c/cutest/CuTests.c b/test/c/cutest/CuTests.c
index 430aa7fa..0e73fb96 100644
--- a/test/c/cutest/CuTests.c
+++ b/test/c/cutest/CuTests.c
@@ -6,6 +6,12 @@
#include "CuTest.h"
+extern int TestCallbackSetterAndGetterSuiteSetup(CuSuite *suite);
+extern int TestCallbackSetterAndGetterSuiteTeardown(CuSuite *suite);
+extern int TestCallbackSetterAndGetterTestSetup(CuTest *ct);
+extern int TestCallbackSetterAndGetterTestTeardown(CuTest *ct);
+extern int TestEnvCallbacks(CuTest *ct);
+extern int TestDbCallbacks(CuTest *ct);
extern int TestChannelSuiteSetup(CuSuite *suite);
extern int TestChannelSuiteTeardown(CuSuite *suite);
extern int TestChannelTestSetup(CuTest *test);
@@ -15,11 +21,14 @@ extern int TestDbHotBackupSuiteSetup(CuSuite *suite);
extern int TestDbHotBackupSuiteTeardown(CuSuite *suite);
extern int TestDbHotBackupTestSetup(CuTest *ct);
extern int TestDbHotBackupTestTeardown(CuTest *ct);
-extern int TestDbHotBackupSimpleEnv(CuTest *ct);
-extern int TestDbHotBackupPartitionDB(CuTest *ct);
-extern int TestDbHotBackupMultiDataDir(CuTest *ct);
-extern int TestDbHotBackupSetLogDir(CuTest *ct);
-extern int TestDbHotBackupQueueDB(CuTest *ct);
+extern int TestBackupSimpleEnvNoCallback(CuTest *ct);
+extern int TestBackupSimpleEnvWithCallback(CuTest *ct);
+extern int TestBackupSimpleEnvWithConfig(CuTest *ct);
+extern int TestBackupPartitionDB(CuTest *ct);
+extern int TestBackupMultiDataDir(CuTest *ct);
+extern int TestBackupSetLogDir(CuTest *ct);
+extern int TestBackupQueueDB(CuTest *ct);
+extern int TestBackupHeapDB(CuTest *ct);
extern int TestDbTuner(CuTest *ct);
extern int TestNoEncryptedDb(CuTest *ct);
extern int TestEncryptedDbFlag(CuTest *ct);
@@ -51,6 +60,7 @@ extern int TestSetTransactionTimeout(CuTest *ct);
extern int TestSetCachesize(CuTest *ct);
extern int TestSetThreadCount(CuTest *ct); /* SKIP */
extern int TestKeyExistErrorReturn(CuTest *ct);
+extern int TestMutexAlignment(CuTest *ct);
extern int TestPartialSuiteSetup(CuSuite *ct);
extern int TestPartialSuiteTeardown(CuSuite *ct);
extern int TestPartialTestSetup(CuTest *ct);
@@ -59,8 +69,49 @@ extern int TestDbPartialGet(CuTest *ct);
extern int TestDbPartialPGet(CuTest *ct);
extern int TestCursorPartialGet(CuTest *ct);
extern int TestCursorPartialPGet(CuTest *ct);
+extern int TestPartitionSuiteSetup(CuSuite *suite);
+extern int TestPartitionSuiteTeardown(CuSuite *suite);
+extern int TestPartitionTestSetup(CuTest *ct);
+extern int TestPartitionTestTeardown(CuTest *ct);
+extern int TestPartOneKeyNoData(CuTest *ct);
+extern int TestPartTwoKeyNoData(CuTest *ct);
+extern int TestPartDuplicatedKey(CuTest *ct);
+extern int TestPartUnsortedKey(CuTest *ct);
+extern int TestPartNumber(CuTest *ct);
+extern int TestPartKeyCallBothSet(CuTest *ct);
+extern int TestPartKeyCallNeitherSet(CuTest *ct);
+extern int TestPreOpenSetterAndGetterSuiteSetup(CuSuite *suite);
+extern int TestPreOpenSetterAndGetterSuiteTeardown(CuSuite *suite);
+extern int TestPreOpenSetterAndGetterTestSetup(CuTest *ct);
+extern int TestPreOpenSetterAndGetterTestTeardown(CuTest *ct);
+extern int TestEnvPreOpenSetterAndGetter(CuTest *ct);
+extern int TestDbPreOpenSetterAndGetter(CuTest *ct);
+extern int TestMpoolFilePreOpenSetterAndGetter(CuTest *ct);
+extern int TestSequencePreOpenSetterAndGetter(CuTest *ct);
extern int TestQueue(CuTest *ct);
+int RunCallbackSetterAndGetterTests(CuString *output)
+{
+ CuSuite *suite = CuSuiteNew("TestCallbackSetterAndGetter",
+ TestCallbackSetterAndGetterSuiteSetup,
+ TestCallbackSetterAndGetterSuiteTeardown);
+ int count;
+
+ SUITE_ADD_TEST(suite, TestEnvCallbacks,
+ TestCallbackSetterAndGetterTestSetup,
+ TestCallbackSetterAndGetterTestTeardown);
+ SUITE_ADD_TEST(suite, TestDbCallbacks,
+ TestCallbackSetterAndGetterTestSetup,
+ TestCallbackSetterAndGetterTestTeardown);
+
+ CuSuiteRun(suite);
+ CuSuiteSummary(suite, output);
+ CuSuiteDetails(suite, output);
+ count = suite->failCount;
+ CuSuiteDelete(suite);
+ return (count);
+}
+
int RunChannelTests(CuString *output)
{
CuSuite *suite = CuSuiteNew("TestChannel",
@@ -84,15 +135,21 @@ int RunDbHotBackupTests(CuString *output)
TestDbHotBackupSuiteSetup, TestDbHotBackupSuiteTeardown);
int count;
- SUITE_ADD_TEST(suite, TestDbHotBackupSimpleEnv,
+ SUITE_ADD_TEST(suite, TestBackupSimpleEnvNoCallback,
+ TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
+ SUITE_ADD_TEST(suite, TestBackupSimpleEnvWithCallback,
+ TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
+ SUITE_ADD_TEST(suite, TestBackupSimpleEnvWithConfig,
TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
- SUITE_ADD_TEST(suite, TestDbHotBackupPartitionDB,
+ SUITE_ADD_TEST(suite, TestBackupPartitionDB,
TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
- SUITE_ADD_TEST(suite, TestDbHotBackupMultiDataDir,
+ SUITE_ADD_TEST(suite, TestBackupMultiDataDir,
TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
- SUITE_ADD_TEST(suite, TestDbHotBackupSetLogDir,
+ SUITE_ADD_TEST(suite, TestBackupSetLogDir,
TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
- SUITE_ADD_TEST(suite, TestDbHotBackupQueueDB,
+ SUITE_ADD_TEST(suite, TestBackupQueueDB,
+ TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
+ SUITE_ADD_TEST(suite, TestBackupHeapDB,
TestDbHotBackupTestSetup, TestDbHotBackupTestTeardown);
CuSuiteRun(suite);
@@ -232,6 +289,23 @@ int RunKeyExistErrorReturnTests(CuString *output)
return (count);
}
+int RunMutexAlignmentTests(CuString *output)
+{
+ CuSuite *suite = CuSuiteNew("TestMutexAlignment",
+ NULL, NULL);
+ int count;
+
+ SUITE_ADD_TEST(suite, TestMutexAlignment,
+ NULL, NULL);
+
+ CuSuiteRun(suite);
+ CuSuiteSummary(suite, output);
+ CuSuiteDetails(suite, output);
+ count = suite->failCount;
+ CuSuiteDelete(suite);
+ return (count);
+}
+
int RunPartialTests(CuString *output)
{
CuSuite *suite = CuSuiteNew("TestPartial",
@@ -255,6 +329,63 @@ int RunPartialTests(CuString *output)
return (count);
}
+int RunPartitionTests(CuString *output)
+{
+ CuSuite *suite = CuSuiteNew("TestPartition",
+ TestPartitionSuiteSetup, TestPartitionSuiteTeardown);
+ int count;
+
+ SUITE_ADD_TEST(suite, TestPartOneKeyNoData,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartTwoKeyNoData,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartDuplicatedKey,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartUnsortedKey,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartNumber,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartKeyCallBothSet,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+ SUITE_ADD_TEST(suite, TestPartKeyCallNeitherSet,
+ TestPartitionTestSetup, TestPartitionTestTeardown);
+
+ CuSuiteRun(suite);
+ CuSuiteSummary(suite, output);
+ CuSuiteDetails(suite, output);
+ count = suite->failCount;
+ CuSuiteDelete(suite);
+ return (count);
+}
+
+int RunPreOpenSetterAndGetterTests(CuString *output)
+{
+ CuSuite *suite = CuSuiteNew("TestPreOpenSetterAndGetter",
+ TestPreOpenSetterAndGetterSuiteSetup,
+ TestPreOpenSetterAndGetterSuiteTeardown);
+ int count;
+
+ SUITE_ADD_TEST(suite, TestEnvPreOpenSetterAndGetter,
+ TestPreOpenSetterAndGetterTestSetup,
+ TestPreOpenSetterAndGetterTestTeardown);
+ SUITE_ADD_TEST(suite, TestDbPreOpenSetterAndGetter,
+ TestPreOpenSetterAndGetterTestSetup,
+ TestPreOpenSetterAndGetterTestTeardown);
+ SUITE_ADD_TEST(suite, TestMpoolFilePreOpenSetterAndGetter,
+ TestPreOpenSetterAndGetterTestSetup,
+ TestPreOpenSetterAndGetterTestTeardown);
+ SUITE_ADD_TEST(suite, TestSequencePreOpenSetterAndGetter,
+ TestPreOpenSetterAndGetterTestSetup,
+ TestPreOpenSetterAndGetterTestTeardown);
+
+ CuSuiteRun(suite);
+ CuSuiteSummary(suite, output);
+ CuSuiteDetails(suite, output);
+ count = suite->failCount;
+ CuSuiteDelete(suite);
+ return (count);
+}
+
int RunQueueTests(CuString *output)
{
CuSuite *suite = CuSuiteNew("TestQueue",
@@ -273,6 +404,7 @@ int RunQueueTests(CuString *output)
}
TestSuite g_suites[] = {
+ { "TestCallbackSetterAndGetter", RunCallbackSetterAndGetterTests },
{ "TestChannel", RunChannelTests },
{ "TestDbHotBackup", RunDbHotBackupTests },
{ "TestDbTuner", RunDbTunerTests },
@@ -280,7 +412,10 @@ TestSuite g_suites[] = {
{ "TestEnvConfig", RunEnvConfigTests },
{ "TestEnvMethod", RunEnvMethodTests },
{ "TestKeyExistErrorReturn", RunKeyExistErrorReturnTests },
+ { "TestMutexAlignment", RunMutexAlignmentTests },
{ "TestPartial", RunPartialTests },
+ { "TestPartition", RunPartitionTests },
+ { "TestPreOpenSetterAndGetter", RunPreOpenSetterAndGetterTests },
{ "TestQueue", RunQueueTests },
{ "", NULL },
};
diff --git a/test/c/cutest/Runner.c b/test/c/cutest/Runner.c
index c8812afe..4de4521f 100644
--- a/test/c/cutest/Runner.c
+++ b/test/c/cutest/Runner.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
@@ -85,9 +85,9 @@ int main(int argc, char **argv)
}
}
while(num_suites != 0)
- free(suites[num_suites--]);
+ free(suites[--num_suites]);
while(num_tests != 0)
- free(tests[num_tests--]);
+ free(tests[--num_tests]);
if (failed > 0)
return (1);
else
View Lorry Controller Status