passenger 5.0.4 → 5.0.5

data/test/cxx/StringMapTest.cpp

@@ -1,131 +0,0 @@
-#include "TestSupport.h"
-#include "Utils/StringMap.h"
-#include <string>
-#include <map>
-
-using namespace Passenger;
-using namespace std;
-
-namespace tut {
-	struct StringMapTest {
-	};
-	
-	DEFINE_TEST_GROUP(StringMapTest);
-	
-	TEST_METHOD(1) {
-		// get()ing a nonexistant key returns the default value.
-		StringMap<string> m;
-		ensure_equals(m.get("hello"), "");
-	}
-	
-	TEST_METHOD(2) {
-		// set() works.
-		StringMap<string> m;
-		m.set("hello", "world");
-		m.set("foo", "bar");
-		ensure_equals(m.get("hello"), "world");
-		ensure_equals(m.get("foo"), "bar");
-		ensure_equals(m.get("something"), "");
-	}
-	
-	TEST_METHOD(3) {
-		// set() overwrites old value.
-		StringMap<string> m;
-		m.set("hello", "world");
-		m.set("foo", "bar");
-		m.set("hello", "new world");
-		ensure_equals(m.get("hello"), "new world");
-		ensure_equals(m.get("foo"), "bar");
-	}
-	
-	TEST_METHOD(4) {
-		// The key is interned so changing the original has no effect.
-		StringMap<string> m;
-		char key1[] = "hello";
-		char key2[] = "world";
-		
-		m.set(key1, "xxx");
-		m.set(key2, "yyy");
-		
-		key1[4] = 'p';
-		strcpy(key2, "zzzzz");
-		
-		ensure_equals(m.get("hello"), "xxx");
-		ensure_equals(m.get("hellp"), "");
-		
-		ensure_equals(m.get("world"), "yyy");
-		ensure_equals(m.get("zzzzz"), "");
-	}
-	
-	TEST_METHOD(5) {
-		// remove() works.
-		StringMap<string> m;
-		m.set("hello", "world");
-		m.set("foo", "bar");
-		
-		ensure(m.remove("hello"));
-		ensure_equals(m.get("hello"), "");
-		ensure_equals(m.get("foo"), "bar");
-		ensure(!m.remove("hello"));
-	}
-	
-	TEST_METHOD(6) {
-		// Test iterators.
-		StringMap<int> m;
-		m.set("a", 1);
-		m.set("b", 2);
-		m.set("c", 3);
-		m.set("d", 4);
-		
-		map<string, int> m2, m3;
-		
-		StringMap<int>::iterator it, end = m.end();
-		for (it = m.begin(); it != end; it++) {
-			pair<StaticString, int> p = *it;
-			m2[it->first] = it->second;
-			m3[p.first] = p.second;
-		}
-		
-		ensure_equals(m2.size(), 4u);
-		ensure_equals(m2["a"], 1);
-		ensure_equals(m2["b"], 2);
-		ensure_equals(m2["c"], 3);
-		ensure_equals(m2["d"], 4);
-		
-		ensure_equals(m3.size(), 4u);
-		ensure_equals(m3["a"], 1);
-		ensure_equals(m3["b"], 2);
-		ensure_equals(m3["c"], 3);
-		ensure_equals(m3["d"], 4);
-	}
-	
-	TEST_METHOD(7) {
-		// Test const_iterators.
-		StringMap<int> m;
-		m.set("a", 1);
-		m.set("b", 2);
-		m.set("c", 3);
-		m.set("d", 4);
-		
-		map<string, int> m2, m3;
-		
-		StringMap<int>::const_iterator it, end = m.end();
-		for (it = m.begin(); it != end; it++) {
-			pair<const StaticString, const int> p = *it;
-			m2[it->first] = it->second;
-			m3[p.first] = p.second;
-		}
-		
-		ensure_equals(m2.size(), 4u);
-		ensure_equals(m2["a"], 1);
-		ensure_equals(m2["b"], 2);
-		ensure_equals(m2["c"], 3);
-		ensure_equals(m2["d"], 4);
-		
-		ensure_equals(m3.size(), 4u);
-		ensure_equals(m3["a"], 1);
-		ensure_equals(m3["b"], 2);
-		ensure_equals(m3["c"], 3);
-		ensure_equals(m3["d"], 4);
-	}
-}

data/test/cxx/SystemTimeTest.cpp

@@ -1,37 +0,0 @@
-#include "TestSupport.h"
-#include "Utils/SystemTime.h"
-
-using namespace Passenger;
-using namespace std;
-
-namespace tut {
-	struct SystemTimeTest {
-		~SystemTimeTest() {
-			SystemTime::release();
-		}
-	};
-	
-	DEFINE_TEST_GROUP(SystemTimeTest);
-	
-	TEST_METHOD(1) {
-		time_t begin = SystemTime::get();
-		
-		SystemTime::force(1);
-		ensure_equals(SystemTime::get(), (time_t) 1);
-		SystemTime::release();
-		
-		time_t now = SystemTime::get();
-		ensure(now >= begin && now <= begin + 2);
-	}
-	
-	TEST_METHOD(2) {
-		time_t begin = SystemTime::get();
-		
-		SystemTime::force(1);
-		ensure_equals(SystemTime::get(), (time_t) 1);
-		SystemTime::release();
-		
-		time_t now = SystemTime::get();
-		ensure(now >= begin && now <= begin + 2);
-	}
-}

data/test/cxx/TemplateTest.cpp

@@ -1,118 +0,0 @@
-#include <TestSupport.h>
-#include <Utils/Template.h>
-#include <cstdarg>
-
-using namespace Passenger;
-
-namespace tut {
-	struct TemplateTest {
-		string apply(const char *templateContent, ...) {
-			va_list ap;
-			const char *arg;
-			StringMap<StaticString> params;
-
-			va_start(ap, templateContent);
-			while ((arg = va_arg(ap, const char *)) != NULL) {
-				params.set(arg, va_arg(ap, const char *));
-			}
-			string result = Template::apply(templateContent, params);
-			va_end(ap);
-			return result;
-		}
-	};
-	
-	DEFINE_TEST_GROUP(TemplateTest);
-	
-	TEST_METHOD(1) {
-		// Test 1 substitution.
-		string result = apply("hello {{name}}",
-			"name", "world",
-			NULL);
-		ensure_equals(result, "hello world");
-	}
-
-	TEST_METHOD(2) {
-		// Test multiple substitutions.
-		string result = apply("hello {{name}} and {{name2}}",
-			"name", "joe",
-			"name2", "jane",
-			NULL);
-		ensure_equals(result, "hello joe and jane");
-	}
-
-	TEST_METHOD(3) {
-		// Test unspecified substitutions.
-		string result = apply("hello {{name}} and {{name2}}!",
-			"name", "joe",
-			NULL);
-		ensure_equals(result, "hello joe and !");
-	}
-
-	TEST_METHOD(4) {
-		// Test default values.
-		string result = apply("hello {{name|default=joe}} and {{name2|default=jane}}",
-			NULL);
-		ensure_equals(result, "hello joe and jane");
-	}
-
-	TEST_METHOD(5) {
-		// Substitutions are HTML-escaped by default.
-		string result = apply("hello {{name}}",
-			"name", "<joe>",
-			NULL);
-		ensure_equals(result, "hello &lt;joe&gt;");
-		result = apply("hello {{name|default=<joe>}}",
-			NULL);
-		ensure_equals(result, "hello &lt;joe&gt;");
-	}
-
-	TEST_METHOD(6) {
-		// HTML escaping can be disabled with the 'raw' option.
-		string result = apply("hello {{name|raw}}",
-			"name", "<joe>",
-			NULL);
-		ensure_equals(result, "hello <joe>");
-	}
-
-	TEST_METHOD(7) {
-		// Test combining default values and the 'raw' option.
-		string result = apply("hello {{name|raw,default=<joe>}}",
-			NULL);
-		ensure_equals(result, "hello <joe>");
-	}
-
-	TEST_METHOD(8) {
-		// Test 'if' statements.
-		string result = apply("hello. {{if morning}}good morning. {{/if}}{{if evening}}good evening. {{/if}}",
-			"morning", "true",
-			NULL);
-		ensure_equals(result, "hello. good morning. ");
-	}
-
-	TEST_METHOD(9) {
-		// An 'if' condition is considered true when it is neither the empty string nor "false".
-		string result = apply("hello. {{if morning}}good morning. {{/if}}"
-			"{{if afternoon}}good afternoon. {{/if}"
-			"{{if evening}}good evening. {{/if}}",
-			"morning", "of course",
-			"afternoon", "false",
-			NULL);
-		ensure_equals(result, "hello. good morning. ");
-	}
-
-	TEST_METHOD(10) {
-		// Test nesting substitutions within 'if's.
-		string result = apply("hello. {{if name}}good morning {{name}}.{{/if}}",
-			"name", "joe",
-			NULL);
-		ensure_equals(result, "hello. good morning joe.");
-	}
-
-	TEST_METHOD(11) {
-		// Test auto-breaking on certain characters.
-		string result = apply("{{content}}",
-			"content", "Hello, world: a=b;c=d",
-			NULL);
-		ensure_equals(result, "Hello,<wbr> world:<wbr> a=<wbr>b;<wbr>c=<wbr>d");
-	}
-}

data/test/cxx/TestSupport.cpp

@@ -1,207 +0,0 @@
-#include "TestSupport.h"
-#include "../support/valgrind.h"
-#include <oxt/backtrace.hpp>
-#include <sys/types.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <grp.h>
-#include <cassert>
-#include <eio.h>
-#include <BackgroundEventLoop.cpp>
-#include <Utils/IOUtils.h>
-#include <Utils/ScopeGuard.h>
-#include <Utils/json.h>
-
-namespace TestSupport {
-
-ResourceLocator *resourceLocator = NULL;
-Json::Value testConfig;
-
-
-void
-createInstanceDir(InstanceDirectoryPtr &instanceDir) {
-	InstanceDirectory::CreationOptions options;
-	struct passwd *pwUser;
-
-	pwUser = getpwnam("nobody");
-	options.prefix = "passenger-test";
-	options.userSwitching = geteuid() == 0;
-	options.defaultUid = pwUser->pw_uid;
-	options.defaultGid = pwUser->pw_gid;
-	instanceDir = boost::make_shared<InstanceDirectory>(options);
-}
-
-static int
-doNothing(eio_req *req) {
-	return 0;
-}
-
-void
-initializeLibeio() {
-	eio_set_idle_timeout(1);
-	eio_set_min_parallel(0);
-	eio_set_max_parallel(1);
-	eio_set_max_idle(0);
-	if (RUNNING_ON_VALGRIND) {
-		// Start an EIO thread to warm up Valgrind.
-		eio_nop(0, doNothing, NULL);
-	}
-}
-
-void
-shutdownLibeio() {
-	// For some reason, eio_nreqs() and eio_npending() never reach 0.
-	// We're probably not shutting down libeio correctly.
-	// As a workaround, we wait for 20 ms after deinitializing.
-	while (eio_nready() > 0) {
-		usleep(10000);
-	}
-	eio_deinit();
-	usleep(20000);
-}
-
-void
-writeUntilFull(int fd) {
-	int flags, ret;
-	char buf[1024];
-
-	memset(buf, 0, sizeof(buf));
-	flags = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-
-	while (true) {
-		ret = write(fd, buf, sizeof(buf));
-		if (ret == -1) {
-			int e = errno;
-			if (e == EAGAIN) {
-				break;
-			} else {
-				throw SystemException("write() failed", e);
-			}
-		}
-	}
-	while (true) {
-		ret = write(fd, buf, 50);
-		if (ret == -1) {
-			int e = errno;
-			if (e == EAGAIN) {
-				break;
-			} else {
-				throw SystemException("write() failed", e);
-			}
-		}
-	}
-	while (true) {
-		ret = write(fd, buf, 1);
-		if (ret == -1) {
-			int e = errno;
-			if (e == EAGAIN) {
-				break;
-			} else {
-				throw SystemException("write() failed", e);
-			}
-		}
-	}
-
-	fcntl(fd, F_SETFL, flags);
-}
-
-void
-replaceStringInFile(const char *filename, const string &toFind, const string &replaceWith) {
-	string content = readAll(filename);
-	FILE *f = fopen(filename, "w");
-	if (f == NULL) {
-		int e = errno;
-		string message = "Cannot open file '";
-		message.append(filename);
-		message.append("' for writing");
-		throw FileSystemException(message, e, filename);
-	} else {
-		StdioGuard guard(f);
-		content = replaceString(content, toFind, replaceWith);
-		fwrite(content.data(), 1, content.size(), f);
-	}
-}
-
-bool
-containsSubstring(const StaticString &str, const StaticString &substr) {
-	return str.find(substr) != string::npos;
-}
-
-void
-writeFile(const string &filename, const string &contents) {
-	FILE *f = fopen(filename.c_str(), "w");
-	if (f == NULL) {
-		int e = errno;
-		string message = "Cannot open file '";
-		message.append(filename);
-		message.append("' for writing");
-		throw FileSystemException(message, e, filename);
-	} else {
-		StdioGuard guard(f);
-		fwrite(contents.data(), 1, contents.size(), f);
-	}
-}
-
-void
-touchFile(const char *filename, time_t timestamp) {
-	FILE *f = fopen(filename, "a");
-	if (f != NULL) {
-		fclose(f);
-	} else if (errno != EISDIR) {
-		int e = errno;
-		string message = "Cannot touch file '";
-		message.append(filename);
-		message.append("'");
-		throw FileSystemException(message, e, filename);
-	}
-
-	if (timestamp != (time_t) -1) {
-		struct utimbuf times;
-		times.actime = timestamp;
-		times.modtime = timestamp;
-		utime(filename, &times);
-	}
-}
-
-vector<string>
-listDir(const string &path) {
-	vector<string> result;
-	DIR *d = opendir(path.c_str());
-	struct dirent *ent;
-
-	if (d == NULL) {
-		int e = errno;
-		throw FileSystemException("Cannot open directory " + path,
-			e, path);
-	}
-	while ((ent = readdir(d)) != NULL) {
-		if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) {
-			continue;
-		}
-		result.push_back(ent->d_name);
-	}
-	return result;
-}
-
-string
-getPrimaryGroupName(const string &username) {
-	struct passwd *user;
-	struct group  *group;
-
-	user = getpwnam(username.c_str());
-	if (user == NULL) {
-		throw RuntimeException(string("User '") + username + "' does not exist.");
-	}
-	group = getgrgid(user->pw_gid);
-	if (group == NULL) {
-		throw RuntimeException(string("Primary group for user '") + username + "' does not exist.");
-	}
-
-	return group->gr_name;
-}
-
-
-} // namespace TestSupport