Fix an fd leak

	* tests/lib/messages.c (test_message_read_file): Fix an fd leak

	* tests/lib/session.c, tests/lib/session.h: a CamelSession
	subclass for the test programs.

	* tests/lib/Makefile.am: include session.[ch]

	* tests/folder/test*.c: Use a CamelTestSession from libcameltest
	instead of cut+pasting everywhere.

	* tests/misc/url.c (main): Update for a camel_url_new change at
	some point.

	* tests/*/.cvsignore: Add stuff.

	* camel-mime-utils.c (rfc2047_encode_word): Fix a silly ==/!=
	mixup.

svn path=/trunk/; revision=10023

10 files changed, 18 insertions, 621 deletions

diff --git a/camel/tests/folder/.cvsignore b/camel/tests/folder/.cvsignore
index ba98331a6d..26eaf2f7e1 100644
--- a/camel/tests/folder/.cvsignore
+++ b/camel/tests/folder/.cvsignore
@@ -10,3 +10,12 @@ temp-test
 *.bbg
 *.da
 *.gcov
+test1
+test2
+test3
+test4
+test5
+test6
+test7
+test8
+test9
diff --git a/camel/tests/folder/test1.c b/camel/tests/folder/test1.c
index 769254f512..4d589099f5 100644
--- a/camel/tests/folder/test1.c
+++ b/camel/tests/folder/test1.c
@@ -2,75 +2,12 @@
 
 #include "camel-test.h"
 #include "folders.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *local_providers[] = {
diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
index 899e6425bf..0fafce35be 100644
--- a/camel/tests/folder/test2.c
+++ b/camel/tests/folder/test2.c
@@ -3,79 +3,16 @@
 #include "camel-test.h"
 #include "messages.h"
 #include "folders.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-summary.h>
 #include <camel/camel-mime-message.h>
 
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *stores[] = {
diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c
index 4fb67c1423..6aa7ad6a60 100644
--- a/camel/tests/folder/test3.c
+++ b/camel/tests/folder/test3.c
@@ -3,10 +3,10 @@
 #include "camel-test.h"
 #include "messages.h"
 #include "folders.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
 #include <camel/camel-folder.h>
@@ -15,69 +15,6 @@
 
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 static void
 test_folder_search_sub(CamelFolder *folder, const char *expr, int expected)
 {
diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c
index af0bc79e87..f6d766f2ac 100644
--- a/camel/tests/folder/test4.c
+++ b/camel/tests/folder/test4.c
@@ -2,86 +2,12 @@
 
 #include "camel-test.h"
 #include "folders.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-	camel_session_class->register_timeout = regtimeout;
-	camel_session_class->remove_timeout = unregtimeout;
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *remote_providers[] = {
diff --git a/camel/tests/folder/test5.c b/camel/tests/folder/test5.c
index c2a3e9af19..20e0c7d011 100644
--- a/camel/tests/folder/test5.c
+++ b/camel/tests/folder/test5.c
@@ -2,88 +2,12 @@
 
 #include "camel-test.h"
 #include "folders.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-	camel_session_class->register_timeout = regtimeout;
-	camel_session_class->remove_timeout = unregtimeout;
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *remote_providers[] = {
diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c
index cbd980a992..215fa999bf 100644
--- a/camel/tests/folder/test6.c
+++ b/camel/tests/folder/test6.c
@@ -2,91 +2,16 @@
 
 #include "camel-test.h"
 #include "messages.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-summary.h>
 #include <camel/camel-mime-message.h>
 
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-	camel_session_class->register_timeout = regtimeout;
-	camel_session_class->remove_timeout = unregtimeout;
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *remote_providers[] = {
diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c
index 5e5015ac0d..2f08712e4c 100644
--- a/camel/tests/folder/test7.c
+++ b/camel/tests/folder/test7.c
@@ -2,90 +2,16 @@
 
 #include "camel-test.h"
 #include "messages.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-summary.h>
 #include <camel/camel-mime-message.h>
 
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-	camel_session_class->register_timeout = regtimeout;
-	camel_session_class->remove_timeout = unregtimeout;
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *remote_providers[] = {
diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c
index 3b9e0eec14..cf8a7ecc8a 100644
--- a/camel/tests/folder/test8.c
+++ b/camel/tests/folder/test8.c
@@ -3,10 +3,10 @@
 #include "camel-test.h"
 #include "folders.h"
 #include "messages.h"
+#include "session.h"
 
 #include <camel/camel-exception.h>
 #include <camel/camel-service.h>
-#include <camel/camel-session.h>
 #include <camel/camel-store.h>
 
 #define MAX_MESSAGES (100)
@@ -25,68 +25,6 @@ int main(int argc, char **argv)
 #include <pthread.h>
 
 
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
 static char *local_providers[] = {
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index f96773d191..cd65143e16 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -3,10 +3,10 @@
 #include "camel-test.h"
 #include "messages.h"
 #include "folders.h"
+#include "session.h"
 
 #include "camel/camel-exception.h"
 #include "camel/camel-service.h"
-#include "camel/camel-session.h"
 #include "camel/camel-store.h"
 
 #include "camel/camel-folder.h"
@@ -17,68 +17,6 @@
 
 #define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
 
-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
-
-typedef struct _CamelTestSession {
-	CamelSession parent_object;
-	
-} CamelTestSession;
-
-typedef struct _CamelTestSessionClass {
-	CamelSessionClass parent_class;
-	
-} CamelTestSessionClass;
-
-static void
-init (CamelTestSession *session)
-{
-	;
-}
-
-static void
-class_init (CamelTestSessionClass *camel_test_session_class)
-{
-	CamelSessionClass *camel_session_class =
-		CAMEL_SESSION_CLASS (camel_test_session_class);
-	
-	/* virtual method override */
-}
-
-static CamelType
-camel_test_session_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelTestSession",
-			sizeof (CamelTestSession),
-			sizeof (CamelTestSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-	
-	return type;
-}
-
-static CamelSession *
-camel_test_session_new (const char *path)
-{
-	CamelSession *session;
-	
-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));
-	
-	camel_session_construct (session, path);
-	
-	return session;
-}
-
 struct {
 	char *name;
 	CamelFolder *folder;