Commit c871d91e authored by Jacob Potter's avatar Jacob Potter

Rename token -> user_token

parent e91fd99a
......@@ -6,7 +6,7 @@
@import "exception.djinni"
@import "client_interface.djinni"
@import "enum.djinni"
@import "token.djinni"
@import "user_token.djinni"
@import "test.djinni"
@import "primtypes.djinni"
@import "constants.djinni"
......
......@@ -21,11 +21,11 @@ test_helpers = interface +c {
static check_enum_map(m: map<color, string>);
static check_enum(c: color);
static token_id(t: token): token;
static create_cpp_token(): token;
static check_cpp_token(t: token);
static cpp_token_id(t: token): i64;
static check_token_type(t: token, type: string);
static token_id(t: user_token): user_token;
static create_cpp_token(): user_token;
static check_cpp_token(t: user_token);
static cpp_token_id(t: user_token): i64;
static check_token_type(t: user_token, type: string);
static return_none(): optional<i32>;
......
token = interface +c +j +o {
user_token = interface +c +j +o {
whoami() : string;
}
......@@ -17,7 +17,7 @@
#include <vector>
class ClientInterface;
class Token;
class UserToken;
class TestHelpers {
public:
......@@ -55,15 +55,15 @@ public:
static void check_enum(color c);
static std::shared_ptr<Token> token_id(const std::shared_ptr<Token> & t);
static std::shared_ptr<UserToken> token_id(const std::shared_ptr<UserToken> & t);
static std::shared_ptr<Token> create_cpp_token();
static std::shared_ptr<UserToken> create_cpp_token();
static void check_cpp_token(const std::shared_ptr<Token> & t);
static void check_cpp_token(const std::shared_ptr<UserToken> & t);
static int64_t cpp_token_id(const std::shared_ptr<Token> & t);
static int64_t cpp_token_id(const std::shared_ptr<UserToken> & t);
static void check_token_type(const std::shared_ptr<Token> & t, const std::string & type);
static void check_token_type(const std::shared_ptr<UserToken> & t, const std::string & type);
static std::experimental::optional<int32_t> return_none();
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#pragma once
#include <string>
class Token {
class UserToken {
public:
virtual ~Token() {}
virtual ~UserToken() {}
virtual std::string whoami() = 0;
};
......@@ -7,7 +7,7 @@ djinni/primitive_list.djinni
djinni/exception.djinni
djinni/client_interface.djinni
djinni/enum.djinni
djinni/token.djinni
djinni/user_token.djinni
djinni/test.djinni
djinni/primtypes.djinni
djinni/constants.djinni
......
......@@ -48,16 +48,16 @@ public abstract class TestHelpers {
public static native void checkEnum(@Nonnull Color c);
@CheckForNull
public static native Token tokenId(@CheckForNull Token t);
public static native UserToken tokenId(@CheckForNull UserToken t);
@CheckForNull
public static native Token createCppToken();
public static native UserToken createCppToken();
public static native void checkCppToken(@CheckForNull Token t);
public static native void checkCppToken(@CheckForNull UserToken t);
public static native long cppTokenId(@CheckForNull Token t);
public static native long cppTokenId(@CheckForNull UserToken t);
public static native void checkTokenType(@CheckForNull Token t, @Nonnull String type);
public static native void checkTokenType(@CheckForNull UserToken t, @Nonnull String type);
@CheckForNull
public static native Integer returnNone();
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
package com.dropbox.djinni.test;
......@@ -7,11 +7,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
public abstract class Token {
public abstract class UserToken {
@Nonnull
public abstract String whoami();
private static final class CppProxy extends Token
private static final class CppProxy extends UserToken
{
private final long nativeRef;
private final AtomicBoolean destroyed = new AtomicBoolean(false);
......
......@@ -10,7 +10,7 @@
#include "NativeNestedCollection.hpp"
#include "NativePrimitiveList.hpp"
#include "NativeSetRecord.hpp"
#include "NativeToken.hpp"
#include "NativeUserToken.hpp"
namespace djinni_generated {
......@@ -171,8 +171,8 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_TestHelpers_tokenId(JNIE
{
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
auto r = ::TestHelpers::token_id(::djinni_generated::NativeToken::toCpp(jniEnv, j_t));
return ::djinni::release(::djinni_generated::NativeToken::fromCpp(jniEnv, r));
auto r = ::TestHelpers::token_id(::djinni_generated::NativeUserToken::toCpp(jniEnv, j_t));
return ::djinni::release(::djinni_generated::NativeUserToken::fromCpp(jniEnv, r));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
}
......@@ -181,7 +181,7 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_TestHelpers_createCppTok
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
auto r = ::TestHelpers::create_cpp_token();
return ::djinni::release(::djinni_generated::NativeToken::fromCpp(jniEnv, r));
return ::djinni::release(::djinni_generated::NativeUserToken::fromCpp(jniEnv, r));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
}
......@@ -189,7 +189,7 @@ CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_TestHelpers_checkCppToken(J
{
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
::TestHelpers::check_cpp_token(::djinni_generated::NativeToken::toCpp(jniEnv, j_t));
::TestHelpers::check_cpp_token(::djinni_generated::NativeUserToken::toCpp(jniEnv, j_t));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
}
......@@ -197,7 +197,7 @@ CJNIEXPORT jlong JNICALL Java_com_dropbox_djinni_test_TestHelpers_cppTokenId(JNI
{
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
auto r = ::TestHelpers::cpp_token_id(::djinni_generated::NativeToken::toCpp(jniEnv, j_t));
auto r = ::TestHelpers::cpp_token_id(::djinni_generated::NativeUserToken::toCpp(jniEnv, j_t));
return ::djinni::release(::djinni::I64::fromCpp(jniEnv, r));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
}
......@@ -206,7 +206,7 @@ CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_TestHelpers_checkTokenType(
{
try {
DJINNI_FUNCTION_PROLOGUE0(jniEnv);
::TestHelpers::check_token_type(::djinni_generated::NativeToken::toCpp(jniEnv, j_t),
::TestHelpers::check_token_type(::djinni_generated::NativeUserToken::toCpp(jniEnv, j_t),
::djinni::String::toCpp(jniEnv, j_type));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
}
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#include "NativeToken.hpp" // my header
#include "NativeUserToken.hpp" // my header
#include "Marshal.hpp"
namespace djinni_generated {
NativeToken::NativeToken() : ::djinni::JniInterface<::Token, NativeToken>("com/dropbox/djinni/test/Token$CppProxy") {}
NativeUserToken::NativeUserToken() : ::djinni::JniInterface<::UserToken, NativeUserToken>("com/dropbox/djinni/test/UserToken$CppProxy") {}
NativeToken::~NativeToken() = default;
NativeUserToken::~NativeUserToken() = default;
NativeToken::JavaProxy::JavaProxy(JniType j) : JavaProxyCacheEntry(j) { }
NativeUserToken::JavaProxy::JavaProxy(JniType j) : JavaProxyCacheEntry(j) { }
NativeToken::JavaProxy::~JavaProxy() = default;
NativeUserToken::JavaProxy::~JavaProxy() = default;
std::string NativeToken::JavaProxy::whoami() {
std::string NativeUserToken::JavaProxy::whoami() {
auto jniEnv = ::djinni::jniGetThreadEnv();
::djinni::JniLocalScope jscope(jniEnv, 10);
const auto& data = ::djinni::JniClass<::djinni_generated::NativeToken>::get();
const auto& data = ::djinni::JniClass<::djinni_generated::NativeUserToken>::get();
auto jret = (jstring)jniEnv->CallObjectMethod(getGlobalRef(), data.method_whoami);
::djinni::jniExceptionCheck(jniEnv);
return ::djinni::String::toCpp(jniEnv, jret);
}
CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_Token_00024CppProxy_nativeDestroy(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_UserToken_00024CppProxy_nativeDestroy(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
{
try {
DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
delete reinterpret_cast<djinni::CppProxyHandle<::Token>*>(nativeRef);
delete reinterpret_cast<djinni::CppProxyHandle<::UserToken>*>(nativeRef);
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
}
CJNIEXPORT jstring JNICALL Java_com_dropbox_djinni_test_Token_00024CppProxy_native_1whoami(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
CJNIEXPORT jstring JNICALL Java_com_dropbox_djinni_test_UserToken_00024CppProxy_native_1whoami(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
{
try {
DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
const auto& ref = ::djinni::CppProxyHandle<::Token>::get(nativeRef);
const auto& ref = ::djinni::CppProxyHandle<::UserToken>::get(nativeRef);
auto r = ref->whoami();
return ::djinni::release(::djinni::String::fromCpp(jniEnv, r));
} JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#pragma once
#include "djinni_support.hpp"
#include "token.hpp"
#include "user_token.hpp"
namespace djinni_generated {
class NativeToken final : ::djinni::JniInterface<::Token, NativeToken> {
class NativeUserToken final : ::djinni::JniInterface<::UserToken, NativeUserToken> {
public:
using CppType = std::shared_ptr<::Token>;
using CppType = std::shared_ptr<::UserToken>;
using JniType = jobject;
using Boxed = NativeToken;
using Boxed = NativeUserToken;
~NativeToken();
~NativeUserToken();
static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeToken>::get()._fromJava(jniEnv, j); }
static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return {jniEnv, ::djinni::JniClass<NativeToken>::get()._toJava(jniEnv, c)}; }
static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeUserToken>::get()._fromJava(jniEnv, j); }
static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return {jniEnv, ::djinni::JniClass<NativeUserToken>::get()._toJava(jniEnv, c)}; }
private:
NativeToken();
friend ::djinni::JniClass<NativeToken>;
friend ::djinni::JniInterface<::Token, NativeToken>;
NativeUserToken();
friend ::djinni::JniClass<NativeUserToken>;
friend ::djinni::JniInterface<::UserToken, NativeUserToken>;
class JavaProxy final : ::djinni::JavaProxyCacheEntry, public ::Token
class JavaProxy final : ::djinni::JavaProxyCacheEntry, public ::UserToken
{
public:
JavaProxy(JniType j);
......@@ -35,11 +35,11 @@ private:
private:
using ::djinni::JavaProxyCacheEntry::getGlobalRef;
friend ::djinni::JniInterface<::Token, ::djinni_generated::NativeToken>;
friend ::djinni::JniInterface<::UserToken, ::djinni_generated::NativeUserToken>;
friend ::djinni::JavaProxyCache<JavaProxy>;
};
const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/djinni/test/Token") };
const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/djinni/test/UserToken") };
const jmethodID method_whoami { ::djinni::jniGetMethodID(clazz.get(), "whoami", "()Ljava/lang/String;") };
};
......
......@@ -9,7 +9,7 @@
#import "DBNestedCollection+Private.h"
#import "DBPrimitiveList+Private.h"
#import "DBSetRecord+Private.h"
#import "DBToken+Private.h"
#import "DBUserToken+Private.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
......@@ -144,37 +144,37 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
} DJINNI_TRANSLATE_EXCEPTIONS()
}
+ (nullable id<DBToken>)tokenId:(nullable id<DBToken>)t {
+ (nullable id<DBUserToken>)tokenId:(nullable id<DBUserToken>)t {
try {
auto r = ::TestHelpers::token_id(::djinni_generated::Token::toCpp(t));
return ::djinni_generated::Token::fromCpp(r);
auto r = ::TestHelpers::token_id(::djinni_generated::UserToken::toCpp(t));
return ::djinni_generated::UserToken::fromCpp(r);
} DJINNI_TRANSLATE_EXCEPTIONS()
}
+ (nullable id<DBToken>)createCppToken {
+ (nullable id<DBUserToken>)createCppToken {
try {
auto r = ::TestHelpers::create_cpp_token();
return ::djinni_generated::Token::fromCpp(r);
return ::djinni_generated::UserToken::fromCpp(r);
} DJINNI_TRANSLATE_EXCEPTIONS()
}
+ (void)checkCppToken:(nullable id<DBToken>)t {
+ (void)checkCppToken:(nullable id<DBUserToken>)t {
try {
::TestHelpers::check_cpp_token(::djinni_generated::Token::toCpp(t));
::TestHelpers::check_cpp_token(::djinni_generated::UserToken::toCpp(t));
} DJINNI_TRANSLATE_EXCEPTIONS()
}
+ (int64_t)cppTokenId:(nullable id<DBToken>)t {
+ (int64_t)cppTokenId:(nullable id<DBUserToken>)t {
try {
auto r = ::TestHelpers::cpp_token_id(::djinni_generated::Token::toCpp(t));
auto r = ::TestHelpers::cpp_token_id(::djinni_generated::UserToken::toCpp(t));
return ::djinni::I64::fromCpp(r);
} DJINNI_TRANSLATE_EXCEPTIONS()
}
+ (void)checkTokenType:(nullable id<DBToken>)t
+ (void)checkTokenType:(nullable id<DBUserToken>)t
type:(nonnull NSString *)type {
try {
::TestHelpers::check_token_type(::djinni_generated::Token::toCpp(t),
::TestHelpers::check_token_type(::djinni_generated::UserToken::toCpp(t),
::djinni::String::toCpp(type));
} DJINNI_TRANSLATE_EXCEPTIONS()
}
......
......@@ -9,7 +9,7 @@
#import "DBSetRecord.h"
#import <Foundation/Foundation.h>
@protocol DBClientInterface;
@protocol DBToken;
@protocol DBUserToken;
@interface DBTestHelpers : NSObject
......@@ -46,15 +46,15 @@
+ (void)checkEnum:(DBColor)c;
+ (nullable id<DBToken>)tokenId:(nullable id<DBToken>)t;
+ (nullable id<DBUserToken>)tokenId:(nullable id<DBUserToken>)t;
+ (nullable id<DBToken>)createCppToken;
+ (nullable id<DBUserToken>)createCppToken;
+ (void)checkCppToken:(nullable id<DBToken>)t;
+ (void)checkCppToken:(nullable id<DBUserToken>)t;
+ (int64_t)cppTokenId:(nullable id<DBToken>)t;
+ (int64_t)cppTokenId:(nullable id<DBUserToken>)t;
+ (void)checkTokenType:(nullable id<DBToken>)t
+ (void)checkTokenType:(nullable id<DBUserToken>)t
type:(nonnull NSString *)type;
+ (nullable NSNumber *)returnNone;
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#include "token.hpp"
#include "user_token.hpp"
#include <memory>
static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
@protocol DBToken;
@protocol DBUserToken;
namespace djinni_generated {
class Token
class UserToken
{
public:
using CppType = std::shared_ptr<::Token>;
using ObjcType = id<DBToken>;
using CppType = std::shared_ptr<::UserToken>;
using ObjcType = id<DBUserToken>;
using Boxed = Token;
using Boxed = UserToken;
static CppType toCpp(ObjcType objc);
static ObjcType fromCpp(const CppType& cpp);
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#import "DBToken+Private.h"
#import "DBToken.h"
#import "DBUserToken+Private.h"
#import "DBUserToken.h"
#import "DJICppWrapperCache+Private.h"
#import "DJIError.h"
#import "DJIMarshal+Private.h"
......@@ -12,17 +12,17 @@
static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
@interface DBTokenCppProxy : NSObject<DBToken>
@interface DBUserTokenCppProxy : NSObject<DBUserToken>
@property (nonatomic, readonly) ::djinni::DbxCppWrapperCache<::Token>::Handle cppRef;
@property (nonatomic, readonly) ::djinni::DbxCppWrapperCache<::UserToken>::Handle cppRef;
- (id)initWithCpp:(const std::shared_ptr<::Token>&)cppRef;
- (id)initWithCpp:(const std::shared_ptr<::UserToken>&)cppRef;
@end
@implementation DBTokenCppProxy
@implementation DBUserTokenCppProxy
- (id)initWithCpp:(const std::shared_ptr<::Token>&)cppRef
- (id)initWithCpp:(const std::shared_ptr<::UserToken>&)cppRef
{
if (self = [super init]) {
_cppRef.assign(cppRef);
......@@ -41,8 +41,8 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
namespace djinni_generated {
class Token::ObjcProxy final
: public ::Token
class UserToken::ObjcProxy final
: public ::UserToken
, public ::djinni::DbxObjcWrapperCache<ObjcProxy>::Handle
{
public:
......@@ -60,18 +60,18 @@ public:
namespace djinni_generated {
auto Token::toCpp(ObjcType objc) -> CppType
auto UserToken::toCpp(ObjcType objc) -> CppType
{
if (!objc) {
return nullptr;
}
if ([(id)objc isKindOfClass:[DBTokenCppProxy class]]) {
return ((DBTokenCppProxy*)objc).cppRef.get();
if ([(id)objc isKindOfClass:[DBUserTokenCppProxy class]]) {
return ((DBUserTokenCppProxy*)objc).cppRef.get();
}
return ::djinni::DbxObjcWrapperCache<ObjcProxy>::getInstance()->get(objc);
}
auto Token::fromCpp(const CppType& cpp) -> ObjcType
auto UserToken::fromCpp(const CppType& cpp) -> ObjcType
{
if (!cpp) {
return nil;
......@@ -79,8 +79,8 @@ auto Token::fromCpp(const CppType& cpp) -> ObjcType
if (auto cppPtr = dynamic_cast<ObjcProxy*>(cpp.get())) {
return cppPtr->Handle::get();
}
return ::djinni::DbxCppWrapperCache<::Token>::getInstance()->get(cpp, [] (const CppType& p) {
return [[DBTokenCppProxy alloc] initWithCpp:p];
return ::djinni::DbxCppWrapperCache<::UserToken>::getInstance()->get(cpp, [] (const CppType& p) {
return [[DBUserTokenCppProxy alloc] initWithCpp:p];
});
}
......
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from token.djinni
// This file generated by Djinni from user_token.djinni
#import <Foundation/Foundation.h>
@protocol DBToken
@protocol DBUserToken
- (nonnull NSString *)whoami;
......
......@@ -12,7 +12,7 @@ djinni-output-temp/cpp/assorted_primitives.hpp
djinni-output-temp/cpp/assorted_primitives.cpp
djinni-output-temp/cpp/test_helpers.hpp
djinni-output-temp/cpp/empty_record.hpp
djinni-output-temp/cpp/token.hpp
djinni-output-temp/cpp/user_token.hpp
djinni-output-temp/cpp/color.hpp
djinni-output-temp/cpp/client_returned_record.hpp
djinni-output-temp/cpp/client_interface.hpp
......@@ -35,7 +35,7 @@ djinni-output-temp/java/ConstantsInterface.java
djinni-output-temp/java/AssortedPrimitives.java
djinni-output-temp/java/TestHelpers.java
djinni-output-temp/java/EmptyRecord.java
djinni-output-temp/java/Token.java
djinni-output-temp/java/UserToken.java
djinni-output-temp/java/Color.java
djinni-output-temp/java/ClientReturnedRecord.java
djinni-output-temp/java/ClientInterface.java
......@@ -65,8 +65,8 @@ djinni-output-temp/jni/NativeTestHelpers.hpp
djinni-output-temp/jni/NativeTestHelpers.cpp
djinni-output-temp/jni/NativeEmptyRecord.hpp
djinni-output-temp/jni/NativeEmptyRecord.cpp
djinni-output-temp/jni/NativeToken.hpp
djinni-output-temp/jni/NativeToken.cpp
djinni-output-temp/jni/NativeUserToken.hpp
djinni-output-temp/jni/NativeUserToken.cpp
djinni-output-temp/jni/NativeColor.hpp
djinni-output-temp/jni/NativeClientReturnedRecord.hpp
djinni-output-temp/jni/NativeClientReturnedRecord.cpp
......@@ -104,7 +104,7 @@ djinni-output-temp/objc/DBAssortedPrimitives.mm
djinni-output-temp/objc/DBTestHelpers.h
djinni-output-temp/objc/DBEmptyRecord.h
djinni-output-temp/objc/DBEmptyRecord.mm
djinni-output-temp/objc/DBToken.h
djinni-output-temp/objc/DBUserToken.h
djinni-output-temp/objc/DBColor.h
djinni-output-temp/objc/DBClientReturnedRecord.h
djinni-output-temp/objc/DBClientReturnedRecord.mm
......@@ -142,8 +142,8 @@ djinni-output-temp/objc/DBTestHelpers+Private.h
djinni-output-temp/objc/DBTestHelpers+Private.mm
djinni-output-temp/objc/DBEmptyRecord+Private.h
djinni-output-temp/objc/DBEmptyRecord+Private.mm
djinni-output-temp/objc/DBToken+Private.h
djinni-output-temp/objc/DBToken+Private.mm
djinni-output-temp/objc/DBUserToken+Private.h
djinni-output-temp/objc/DBUserToken+Private.mm
djinni-output-temp/objc/DBClientReturnedRecord+Private.h
djinni-output-temp/objc/DBClientReturnedRecord+Private.mm
djinni-output-temp/objc/DBClientInterface+Private.h
......
#include "test_helpers.hpp"
#include "client_returned_record.hpp"
#include "client_interface.hpp"
#include "token.hpp"
#include "user_token.hpp"
#include <exception>
SetRecord TestHelpers::get_set_record() {
......@@ -86,28 +86,28 @@ void TestHelpers::check_client_interface_nonascii(const std::shared_ptr<ClientIn
}
}
std::shared_ptr<Token> TestHelpers::token_id(const std::shared_ptr<Token> & in) {
std::shared_ptr<UserToken> TestHelpers::token_id(const std::shared_ptr<UserToken> & in) {
return in;
}
class CppToken : public Token {
class CppToken : public UserToken {
std::string whoami() { return "C++"; }
};
std::shared_ptr<Token> TestHelpers::create_cpp_token() {
std::shared_ptr<UserToken> TestHelpers::create_cpp_token() {
return std::make_shared<CppToken>();
}
void TestHelpers::check_cpp_token(const std::shared_ptr<Token> & in) {
void TestHelpers::check_cpp_token(const std::shared_ptr<UserToken> & in) {
// Throws bad_cast if type is wrong
(void)dynamic_cast<CppToken &>(*in);
}
int64_t TestHelpers::cpp_token_id(const std::shared_ptr<Token> & in) {
int64_t TestHelpers::cpp_token_id(const std::shared_ptr<UserToken> & in) {
return reinterpret_cast<int64_t>(in.get());
}
void TestHelpers::check_token_type(const std::shared_ptr<Token> &t, const std::string & type) {
void TestHelpers::check_token_type(const std::shared_ptr<UserToken> &t, const std::string & type) {
if (t->whoami() != type) {
throw std::invalid_argument("wrong token type");
}
......
......@@ -4,7 +4,7 @@ import junit.framework.TestCase;
public class TokenTest extends TestCase {
private class JavaToken extends Token {
private class JavaToken extends UserToken {
public String whoami() { return "Java"; }
}
......@@ -13,7 +13,7 @@ public class TokenTest extends TestCase {
}
public void testTokens() {
Token jt = new JavaToken();
UserToken jt = new JavaToken();
assertSame(TestHelpers.tokenId(jt), jt);
}
......@@ -22,7 +22,7 @@ public class TokenTest extends TestCase {
}
public void testCppToken() {
Token ct = TestHelpers.createCppToken();
UserToken ct = TestHelpers.createCppToken();
assertSame(TestHelpers.tokenId(ct), ct);
TestHelpers.checkCppToken(ct);
ct = null;
......
#import "DBTestHelpers.h"
#import "DBToken.h"
#import "DBUserToken.h"
#import <XCTest/XCTest.h>
@interface DBTokenTests : XCTestCase
@end
@interface DBObjcToken : NSObject<DBToken>
@interface DBObjcToken : NSObject<DBUserToken>
- (NSString *)whoami;
@end
@implementation DBObjcToken
......@@ -29,7 +29,7 @@
- (void)testTokens
{
id<DBToken> t = [[DBObjcToken alloc] init];
id<DBUserToken> t = [[DBObjcToken alloc] init];
XCTAssertEqual([DBTestHelpers tokenId:t], t);
}
......@@ -48,7 +48,7 @@
- (void)testCppToken
{
id<DBToken> ct = [DBTestHelpers createCppToken];
id<DBUserToken> ct = [DBTestHelpers createCppToken];
XCTAssertEqual([DBTestHelpers tokenId:ct], ct);
[DBTestHelpers checkCppToken:ct];
ct = nil;
......
......@@ -88,8 +88,8 @@
CFFD588E1B019E79001E10B6 /* DBCppException+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58881B019E79001E10B6 /* DBCppException+Private.mm */; };
CFFD588F1B019E79001E10B6 /* DBTestHelpers+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58891B019E79001E10B6 /* DBTestHelpers+Private.mm */; };
CFFD58901B019E79001E10B6 /* DBTestHelpers+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58891B019E79001E10B6 /* DBTestHelpers+Private.mm */; };
CFFD58911B019E79001E10B6 /* DBToken+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD588A1B019E79001E10B6 /* DBToken+Private.mm */; };
CFFD58921B019E79001E10B6 /* DBToken+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD588A1B019E79001E10B6 /* DBToken+Private.mm */; };
CFFD58911B019E79001E10B6 /* DBUserToken+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD588A1B019E79001E10B6 /* DBUserToken+Private.mm */; };
CFFD58921B019E79001E10B6 /* DBUserToken+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD588A1B019E79001E10B6 /* DBUserToken+Private.mm */; };
CFFD58B11B041BD9001E10B6 /* DBConstantsInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58AE1B041BD9001E10B6 /* DBConstantsInterface.mm */; };
CFFD58B21B041BD9001E10B6 /* DBConstantsInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58AE1B041BD9001E10B6 /* DBConstantsInterface.mm */; };
CFFD58B31B041BD9001E10B6 /* DBConstantsInterface+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFFD58B01B041BD9001E10B6 /* DBConstantsInterface+Private.mm */; };
......@@ -187,8 +187,8 @@
A24249441AF192E0003BF8F0 /* DBSetRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBSetRecord.h; sourceTree = "<group>"; };
A24249461AF192E0003BF8F0 /* DBTestHelpers+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBTestHelpers+Private.h"; sourceTree = "<group>"; };
A24249471AF192E0003BF8F0 /* DBTestHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBTestHelpers.h; sourceTree = "<group>"; };
A24249491AF192E0003BF8F0 /* DBToken+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBToken+Private.h"; sourceTree = "<group>"; };
A242494A1AF192E0003BF8F0 /* DBToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBToken.h; sourceTree = "<group>"; };
A24249491AF192E0003BF8F0 /* DBUserToken+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBUserToken+Private.h"; sourceTree = "<group>"; };
A242494A1AF192E0003BF8F0 /* DBUserToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBUserToken.h; sourceTree = "<group>"; };
A24249601AF192FC003BF8F0 /* client_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = client_interface.hpp; sourceTree = "<group>"; };
A24249611AF192FC003BF8F0 /* client_returned_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = client_returned_record.hpp; sourceTree = "<group>"; };
A24249621AF192FC003BF8F0 /* color.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = color.hpp; sourceTree = "<group>"; };
......@@ -207,7 +207,7 @@
A242496F1AF192FC003BF8F0 /* record_with_nested_derivings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = record_with_nested_derivings.hpp; sourceTree = "<group>"; };
A24249701AF192FC003BF8F0 /* set_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = set_record.hpp; sourceTree = "<group>"; };
A24249711AF192FC003BF8F0 /* test_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_helpers.hpp; sourceTree = "<group>"; };
A24249721AF192FC003BF8F0 /* token.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = token.hpp; sourceTree = "<group>"; };
A24249721AF192FC003BF8F0 /* user_token.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_token.hpp; sourceTree = "<group>"; };
A248501B1AF96EBC00AFE907 /* DBClientReturnedRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBClientReturnedRecord.mm; sourceTree = "<group>"; };
A248501C1AF96EBC00AFE907 /* DBConstants.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBConstants.mm; sourceTree = "<group>"; };
A248501D1AF96EBC00AFE907 /* DBDateRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBDateRecord.mm; sourceTree = "<group>"; };
......@@ -267,7 +267,7 @@
CFFD58871B019E79001E10B6 /* DBClientInterface+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBClientInterface+Private.mm"; sourceTree = "<group>"; };
CFFD58881B019E79001E10B6 /* DBCppException+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBCppException+Private.mm"; sourceTree = "<group>"; };
CFFD58891B019E79001E10B6 /* DBTestHelpers+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBTestHelpers+Private.mm"; sourceTree = "<group>"; };
CFFD588A1B019E79001E10B6 /* DBToken+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBToken+Private.mm"; sourceTree = "<group>"; };
CFFD588A1B019E79001E10B6 /* DBUserToken+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBUserToken+Private.mm"; sourceTree = "<group>"; };
CFFD58AD1B041BD9001E10B6 /* DBConstantsInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBConstantsInterface.h; sourceTree = "<group>"; };
CFFD58AE1B041BD9001E10B6 /* DBConstantsInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBConstantsInterface.mm; sourceTree = "<group>"; };
CFFD58AF1B041BD9001E10B6 /* DBConstantsInterface+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBConstantsInterface+Private.h"; sourceTree = "<group>"; };
......@@ -480,9 +480,9 @@
A24249471AF192E0003BF8F0 /* DBTestHelpers.h */,
A24249461AF192E0003BF8F0 /* DBTestHelpers+Private.h */,
CFFD58891B019E79001E10B6 /* DBTestHelpers+Private.mm */,
A242494A1AF192E0003BF8F0 /* DBToken.h */,
A24249491AF192E0003BF8F0 /* DBToken+Private.h */,
CFFD588A1B019E79001E10B6 /* DBToken+Private.mm */,
A242494A1AF192E0003BF8F0 /* DBUserToken.h */,
A24249491AF192E0003BF8F0 /* DBUserToken+Private.h */,
CFFD588A1B019E79001E10B6 /* DBUserToken+Private.mm */,
);
name = "generated-objc";
path = "../generated-src/objc";
......@@ -522,7 +522,7 @@
A24249701AF192FC003BF8F0 /* set_record.hpp */,
CFC5DA031B15319600BF2DF8 /* test_duration.hpp */,
A24249711AF192FC003BF8F0 /* test_helpers.hpp */,
A24249721AF192FC003BF8F0 /* token.hpp */,
A24249721AF192FC003BF8F0 /* user_token.hpp */,
);
name = "generated-cpp";
path = "../generated-src/cpp";
......@@ -641,7 +641,7 @@
CFFD58B71B041BFD001E10B6 /* constants_interface.cpp in Sources */,
CFAED8751B54291900E3B8A3 /* DBEmptyRecord.mm in Sources */,
A238CA9A1AF84B7100CDDCE5 /* DBNestedCollection+Private.mm in Sources */,
CFFD58911B019E79001E10B6 /* DBToken+Private.mm in Sources */,
CFFD58911B019E79001E10B6 /* DBUserToken+Private.mm in Sources */,
A2CB54B419BA6E6000A9E600 /* DJIError.mm in Sources */,
A238CA961AF84B7100CDDCE5 /* DBMapListRecord+Private.mm in Sources */,
A238CA9C1AF84B7100CDDCE5 /* DBPrimitiveList+Private.mm in Sources */,
......@@ -685,7 +685,7 @@
CFC5DA021B15318B00BF2DF8 /* DBTestDuration+Private.mm in Sources */,
CFFD58B41B041BD9001E10B6 /* DBConstantsInterface+Private.mm in Sources */,
CFFD58901B019E79001E10B6 /* DBTestHelpers+Private.mm in Sources */,
CFFD58921B019E79001E10B6 /* DBToken+Private.mm in Sources */,
CFFD58921B019E79001E10B6 /* DBUserToken+Private.mm in Sources */,
CFFD58B21B041BD9001E10B6 /* DBConstantsInterface.mm in Sources */,
6536CD9319A6C9A800DD7715 /* DBRecordWithDerivingsObjcTests.mm in Sources */,
B52DA56A1B103F75005CE75F /* DBAssortedPrimitives+Private.mm in Sources */,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment