Add argument wrapper for directory and files.

This commit is contained in:
Mikaël Capelle
2022-05-04 20:54:06 +02:00
parent b42ce25b6e
commit 65ccc4af9c
11 changed files with 437 additions and 27 deletions
+69
View File
@@ -0,0 +1,69 @@
#include "pybind11_utils/arg_wrapper.h"
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <string>
// wrapper that can be constructed from
class Wrapper {
std::string value;
public:
Wrapper() = default;
Wrapper(Wrapper const&) = default;
Wrapper(Wrapper&&) = default;
Wrapper& operator=(Wrapper const&) = default;
Wrapper& operator=(Wrapper&&) = default;
template <class U, std::enable_if_t<std::is_convertible_v<U, std::string>, int> = 0>
Wrapper(U&& u) : value{std::forward<U>(u)}
{
}
Wrapper(int u) : value{std::to_string(u)} {}
operator int() const { return std::stoi(value); }
operator std::string() const { return value; }
};
MO2_PYBIND11_WRAP_ARGUMENT_CASTER(Wrapper, int, std::string);
template <std::size_t... Is, class Fn>
auto wrap(Fn&& fn)
{
return mo2::python::wrap_arguments<Wrapper, Is...>(std::forward<Fn>(fn));
}
std::string fn1(std::string const& value)
{
return value + "-" + value;
}
int fn2(int value)
{
return value * 2;
}
std::string fn3(int value, std::vector<int> values, std::string const& name)
{
return name + "-" + std::to_string(value + values.size());
}
PYBIND11_MODULE(argument_wrapper, m)
{
m.def("fn1_raw", &fn1);
m.def("fn1_wrap", wrap(&fn1));
m.def("fn1_wrap_0", wrap<0>(&fn1));
m.def("fn2_raw", &fn2);
m.def("fn2_wrap", wrap(&fn2));
m.def("fn2_wrap_0", wrap<0>(&fn2));
m.def("fn3_raw", &fn3);
m.def("fn3_wrap", wrap(&fn3));
m.def("fn3_wrap_0", wrap<0>(&fn3));
m.def("fn3_wrap_2", wrap<2>(&fn3));
m.def("fn3_wrap_0_2", wrap<0, 2>(&fn3));
}
+63
View File
@@ -0,0 +1,63 @@
import mobase
import pytest
m = pytest.importorskip("mobase_tests.argument_wrapper")
def test_argument_wrapper_fn1():
assert m.fn1_raw("hello") == "hello-hello"
with pytest.raises(TypeError):
m.fn1_raw(1)
assert m.fn1_wrap("hello") == "hello-hello"
assert m.fn1_wrap(32) == "32-32"
assert m.fn1_wrap_0("world") == "world-world"
assert m.fn1_wrap_0(45) == "45-45"
def test_argument_wrapper_fn2():
assert m.fn2_raw(33) == 66
with pytest.raises(TypeError):
m.fn2_raw("12")
assert m.fn2_wrap("15") == 30
assert m.fn2_wrap(32) == 64
assert m.fn2_wrap_0("-15") == -30
assert m.fn2_wrap_0(45) == 90
def test_argument_wrapper_fn3():
assert m.fn3_raw(33, [], "hello") == "hello-33"
assert m.fn3_raw(33, [1, 2], "hello") == "hello-35"
with pytest.raises(TypeError):
m.fn3_raw("12", [], "hello")
with pytest.raises(TypeError):
m.fn3_raw(36, [], 136)
assert m.fn3_wrap(14, [1, 2], "world") == "world-16"
assert m.fn3_wrap("15", [0], "woot") == "woot-16"
assert m.fn3_wrap(17, [], 33) == "33-17"
assert m.fn3_wrap("15", [], 44) == "44-15"
assert m.fn3_wrap_0_2(14, [1, 2], "world") == "world-16"
assert m.fn3_wrap_0_2("15", [0], "woot") == "woot-16"
assert m.fn3_wrap_0_2(17, [], 33) == "33-17"
assert m.fn3_wrap_0_2("15", [], 44) == "44-15"
assert m.fn3_wrap_0(14, [1, 2], "world") == "world-16"
assert m.fn3_wrap_0("15", [], "w00t") == "w00t-15"
with pytest.raises(TypeError):
m.fn3_wrap_0(14, [], 12)
assert m.fn3_wrap_2(14, [1, 2], "world") == "world-16"
assert m.fn3_wrap_2(15, [], 18) == "18-15"
with pytest.raises(TypeError):
m.fn3_wrap_2("14", [], 12)
+45
View File
@@ -0,0 +1,45 @@
import sys
from pathlib import Path
import mobase
import pytest
from PyQt6.QtCore import QDir, QFileInfo
def test_filepath_wrappers():
# TBC that this works everywhere
version = ".".join(map(str, sys.version_info[:3]))
# from string, ok
assert mobase.getProductVersion(sys.executable) == version
# from path, ok
assert mobase.getProductVersion(Path(sys.executable)) == version
# from QDir, ko
with pytest.raises(TypeError):
mobase.getProductVersion(QDir(sys.executable))
def test_executableinfo():
info = mobase.ExecutableInfo("exe", QFileInfo(sys.executable))
assert info.binary() == QFileInfo(sys.executable)
info = mobase.ExecutableInfo("exe", sys.executable)
assert info.binary() == QFileInfo(sys.executable)
info = mobase.ExecutableInfo("exe", Path(sys.executable))
assert info.binary() == QFileInfo(sys.executable)
info.withWorkingDirectory(Path(__file__).parent)
assert info.workingDirectory() == QFileInfo(__file__).dir()
info.withWorkingDirectory(".")
assert info.workingDirectory() == QDir(".")
info.withWorkingDirectory(Path("."))
assert info.workingDirectory() == QDir(".")
info.withWorkingDirectory(".")
assert info.workingDirectory() == QDir(".")