|
@@ -3,7 +3,7 @@
|
|
|
* Company: Lynar Studios
|
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
|
* Created: 2023-04-07
|
|
|
-* Changed: 2023-04-11
|
|
|
+* Changed: 2023-05-16
|
|
|
*
|
|
|
* */
|
|
|
|
|
@@ -37,10 +37,10 @@ namespace
|
|
|
|
|
|
JniClass createJniClass(const string &_classPath)
|
|
|
{
|
|
|
- shared_ptr<JniClassParameter> parameter = make_shared<JniClassParameter>();
|
|
|
+ auto parameter = make_shared<JniClassParameter>();
|
|
|
this->jniApi = make_shared<MockJniApi>();
|
|
|
parameter->setJniApi(this->jniApi);
|
|
|
- shared_ptr<JNIEnv> environment = make_shared<JNIEnv>();
|
|
|
+ auto environment = make_shared<JNIEnv>();
|
|
|
parameter->setJavaEnvironment(environment.get());
|
|
|
|
|
|
return JniClass{parameter, _classPath};
|
|
@@ -120,7 +120,7 @@ namespace
|
|
|
string methodIdentifier = "isBlue";
|
|
|
string methodSignature = "()Z";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callBooleanMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -142,7 +142,7 @@ namespace
|
|
|
string methodIdentifier = "getDay";
|
|
|
string methodSignature = "()B";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callByteMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -164,7 +164,7 @@ namespace
|
|
|
string methodIdentifier = "getLetter";
|
|
|
string methodSignature = "()C";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callCharMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -186,11 +186,11 @@ namespace
|
|
|
string methodIdentifier = "getPi";
|
|
|
string methodSignature = "()D";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
|
- ON_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).WillByDefault(Return(3.14159265l));
|
|
|
+ ON_CALL(*this->jniApi, callDoubleMethod(testing::_, methodId)).WillByDefault(Return(3.14159265L));
|
|
|
|
|
|
ASSERT_TRUE(javaClass.load());
|
|
|
ASSERT_TRUE(javaClass.loadMethod(methodIdentifier, methodSignature));
|
|
@@ -208,11 +208,11 @@ namespace
|
|
|
string methodIdentifier = "getPi";
|
|
|
string methodSignature = "()F";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
|
- ON_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).WillByDefault(Return(3.14159f));
|
|
|
+ ON_CALL(*this->jniApi, callFloatMethod(testing::_, methodId)).WillByDefault(Return(3.14159F));
|
|
|
|
|
|
ASSERT_TRUE(javaClass.load());
|
|
|
ASSERT_TRUE(javaClass.loadMethod(methodIdentifier, methodSignature));
|
|
@@ -230,7 +230,7 @@ namespace
|
|
|
string methodIdentifier = "getYear";
|
|
|
string methodSignature = "()I";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callIntMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -252,7 +252,7 @@ namespace
|
|
|
string methodIdentifier = "getAmountOfMoney";
|
|
|
string methodSignature = "()J";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callLongMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -274,7 +274,7 @@ namespace
|
|
|
string methodIdentifier = "getDay";
|
|
|
string methodSignature = "()S";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
EXPECT_CALL(*this->jniApi, callShortMethod(testing::_, methodId)).Times(AtLeast(1));
|
|
@@ -315,7 +315,7 @@ namespace
|
|
|
string methodIdentifier = "getDay";
|
|
|
string methodSignature = "()B";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
ASSERT_TRUE(javaClass.load());
|
|
@@ -333,7 +333,7 @@ namespace
|
|
|
string methodIdentifier = "getDay";
|
|
|
string methodSignature = "()B";
|
|
|
EXPECT_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).Times(AtLeast(1));
|
|
|
- jmethodID methodId = (jmethodID) make_shared<int>().get();
|
|
|
+ auto methodId = (jmethodID) make_shared<int>().get();
|
|
|
ON_CALL(*this->jniApi, getMethodId(testing::_, methodIdentifier.c_str(), methodSignature.c_str())).WillByDefault(Return(methodId));
|
|
|
|
|
|
ASSERT_TRUE(javaClass.load());
|