This commit is contained in:
jed
2012-11-15 05:04:21 -08:00
parent 46cd90b47b
commit 850c7004c8
2 changed files with 22 additions and 11 deletions

View File

@@ -49,13 +49,13 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\OpenSSL\include;..\boost_1_47_0;..\protobuf\src\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src\</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\OpenSSL\lib\VC;..\boost_1_47_0\stage\lib;..\protobuf\vsprojects\Debug</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\OpenSSL\lib\VC;..\boost_1_52_0\stage\lib;..\protobuf\vsprojects\Debug</AdditionalLibraryDirectories>
<AdditionalDependencies>ssleay32MDd.lib;libeay32MTd.lib;libprotobuf.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ssleay32MDd.lib;libeay32MTd.lib;libprotobuf.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>

View File

@@ -20,13 +20,20 @@ buster.testCase("Simple", {
'tearDown' : testutils.build_teardown(), 'tearDown' : testutils.build_teardown(),
"simple." : "simple." :
function (done) { buster.assert(1); done(); function (done) { buster.assert(1);
this.remote.transaction() this.remote.transaction()
.payment('root', 'alice', "10000") .payment('root', 'alice', "10000")
.on('success', function (r) { .on('success', function (r) {
done(); done();
}).submit(); }).submit();
this.remote.transaction()
.payment('root', 'alice', "20000")
.on('success', function (r) {
done();
}).submit();
} }
}); });
@@ -44,8 +51,11 @@ buster.testCase("Sending", {
.payment('root', 'alice', "10000") .payment('root', 'alice', "10000")
.on('success', function (r) { .on('success', function (r) {
// Transaction sent. // Transaction sent.
// buster.assert(false, "Succeded.");
// console.log("success: %s", JSON.stringify(r)); // done();
buster.assert.equals(r.result, 'terNO_DST');
console.log("success: %s", JSON.stringify(r));
done();
}) })
.on('pending', function() { .on('pending', function() {
// Moving ledgers along. // Moving ledgers along.
@@ -69,11 +79,11 @@ buster.testCase("Sending", {
}) })
.on('proposed', function (m) { .on('proposed', function (m) {
// Transaction got an error. // Transaction got an error.
// console.log("proposed: %s", JSON.stringify(m)); console.log("proposed: %s", JSON.stringify(m));
buster.assert.equals(m.result, 'terNO_DST'); buster.assert.equals(m.result, 'terNO_DST');
//done();
got_proposed = true; got_proposed = true;
self.remote.ledger_accept(); // Move it along. self.remote.ledger_accept(); // Move it along.
}) })
@@ -87,6 +97,7 @@ buster.testCase("Sending", {
// console.log("error: %s", m); // console.log("error: %s", m);
buster.assert(false); buster.assert(false);
done();
}) })
.submit(); .submit();
}, },
@@ -97,7 +108,7 @@ buster.testCase("Sending", {
this.remote.transaction() this.remote.transaction()
.ripple_line_set("root", "100/USD/alice") .ripple_line_set("root", "100/USD/alice")
.on('proposed', function (m) { .on('proposed', function (m) {
// console.log("proposed: %s", JSON.stringify(m)); console.log("proposed: %s", JSON.stringify(m));
buster.assert.equals(m.result, 'terNO_DST'); buster.assert.equals(m.result, 'terNO_DST');
@@ -105,7 +116,7 @@ buster.testCase("Sending", {
}) })
.submit(); .submit();
}, },
/*
"credit_limit" : "credit_limit" :
function (done) { function (done) {
var self = this; var self = this;
@@ -248,7 +259,7 @@ buster.testCase("Sending", {
buster.refute(error, self.what); buster.refute(error, self.what);
done(); done();
}); });
}, },*/
}); });
// XXX In the future add ledger_accept after partial retry is implemented in the server. // XXX In the future add ledger_accept after partial retry is implemented in the server.