Add a test for stuff in the module's global dict

src/core/utilities.cpp

@@ -137,10 +137,13 @@ quint64 FileSystemFreeSpace(const QString& path) {
   return 0;
 }
 
-QString MakeTempDir() {
+QString MakeTempDir(const QString template_name) {
   QString path;
   {
     QTemporaryFile tempfile;
+    if (!template_name.isEmpty())
+      tempfile.setFileTemplate(template_name);
+
     tempfile.open();
     path = tempfile.fileName();
   }

src/core/utilities.h

@@ -37,7 +37,7 @@ namespace Utilities {
   quint64 FileSystemCapacity(const QString& path);
   quint64 FileSystemFreeSpace(const QString& path);
 
-  QString MakeTempDir();
+  QString MakeTempDir(const QString template_name = QString());
   void RemoveRecursive(const QString& path);
   bool CopyRecursive(const QString& source, const QString& destination);
   bool Copy(QIODevice* source, QIODevice* destination);

src/scripting/scriptinfo.cpp

@@ -34,7 +34,7 @@ ScriptInfo::ScriptInfo()
 
 void ScriptInfo::InitFromDirectory(const ScriptManager* manager, const QString& path) {
   const QString ini_file = path + "/" + kIniFileName;
-  const QString id = QFileInfo(path).completeBaseName();
+  const QString id = QFileInfo(path).fileName();
 
   // Does the file exist?
   if (!QFile::exists(ini_file)) {

tests/python_test.cpp

@@ -35,8 +35,8 @@ namespace {
 
 class TemporaryScript : boost::noncopyable {
 public:
-  TemporaryScript(const char* code) {
+  TemporaryScript(const QString& code, const QString& directory_template = QString()) {
-    directory_ = Utilities::MakeTempDir();
+    directory_ = Utilities::MakeTempDir(directory_template);
 
     QSettings ini(directory_ + "/script.ini", QSettings::IniFormat);
     ini.beginGroup("Script");
@@ -45,7 +45,7 @@ public:
 
     QFile script(directory_ + "/script.py");
     script.open(QIODevice::WriteOnly);
-    script.write(code);
+    script.write(code.toUtf8());
   }
 
   ~TemporaryScript() {
@@ -114,15 +114,38 @@ TEST_F(PythonTest, CleanupModuleDict) {
         "  def __del__(self):\n"
         "    print 'destructor'\n"
         "f = Foo()\n");
-
   ScriptInfo info;
   info.InitFromDirectory(manager_, script.directory_);
 
   Script* s = engine_->CreateScript(info);
-  ASSERT_TRUE(manager_->log_lines().last().endsWith("constructor"));
+  ASSERT_TRUE(manager_->log_lines_plain().last().endsWith("constructor"));
 
   engine_->DestroyScript(s);
-  ASSERT_TRUE(manager_->log_lines().last().endsWith("destructor"));
+  ASSERT_TRUE(manager_->log_lines_plain().last().endsWith("destructor"));
+}
+
+TEST_F(PythonTest, ModuleConstants) {
+  TemporaryScript script(
+        "print __builtins__\n"
+        "print __file__\n"
+        "print __name__\n"
+        "print __package__\n"
+        "print __path__\n"
+        "print script\n");
+  ScriptInfo info;
+  info.InitFromDirectory(manager_, script.directory_);
+
+  engine_->CreateScript(info);
+
+  const QStringList log = manager_->log_lines_plain();
+  const int n = log.count();
+  ASSERT_GE(n, 6);
+  EXPECT_TRUE(log.at(n-6).endsWith("<module '__builtin__' (built-in)>"));     // __builtins__
+  EXPECT_TRUE(log.at(n-5).endsWith(script.directory_ + "/script.py"));        // __file__
+  EXPECT_TRUE(log.at(n-4).endsWith("clementinescripts." + info.id()));        // __name__
+  EXPECT_TRUE(log.at(n-3).endsWith("None"));                                  // __package__
+  EXPECT_TRUE(log.at(n-2).endsWith("['" + script.directory_ + "']"));         // __path__
+  EXPECT_TRUE(log.at(n-1).contains("<clementine.ScriptInterface object at")); // script
 }
 
 }  // namespace