Skip to content

Commit a781208

Browse files
rozdrozd
authored
Merge pull request #14 from airext/bugfix/hex
Fixes for HEX functions
2 parents 1233290 + 3c9f0d2 commit a781208

File tree

32 files changed

+583
-262
lines changed

32 files changed

+583
-262
lines changed

‎.github/workflows/dryrun.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ jobs:
5656
with:
5757
name: tests_failure_on_win.txt
5858
path: build/test/tests_failure.txt
59+
- name: Upload Unit Tests Logs
60+
if: always()
61+
uses: actions/upload-artifact@v1
62+
with:
63+
name: tests_logs_on_win.txt
64+
path: build/test/tests_log.txt
5965

6066
test-on-mac:
6167
runs-on: [macos-latest]
@@ -104,5 +110,10 @@ jobs:
104110
with:
105111
name: tests_failure_on_mac.txt
106112
path: build/test/tests_failure.txt
107-
113+
- name: Upload Unit Tests Logs
114+
if: always()
115+
uses: actions/upload-artifact@v1
116+
with:
117+
name: tests_logs_on_mac.txt
118+
path: build/test/tests_log.txt
108119

‎build/build.xml

+14-6
Original file line numberDiff line numberDiff line change
@@ -484,19 +484,27 @@
484484
</pathconvert>
485485

486486
<exec executable="open" dir="test">
487-
<arg line="-a OpenSSLTests.app ${tests.working.dir}" />
487+
<arg line="-a ${tests.working.dir}/OpenSSLTests.app ${tests.working.dir}" />
488488
</exec>
489489

490-
<waitfor maxwait="2" maxwaitunit="minute">
490+
<echo>Waiting for unit tests app...</echo>
491+
<waitfor maxwait="5" maxwaitunit="minute">
491492
<or>
492-
<available file="test/tests_success.txt" />
493-
<available file="test/tests_failure.txt" />
493+
<available file="${tests.working.dir}/tests_success.txt" />
494+
<available file="${tests.working.dir}/tests_failure.txt" />
494495
</or>
495496
</waitfor>
496497

498+
<echo>Build directory listing:</echo>
499+
<exec executable="find" dir="${tests.working.dir}">
500+
<arg line="." />
501+
</exec>
502+
497503
<fail>
498504
<condition>
499-
<available file="test/tests_failure.txt" />
505+
<not>
506+
<available file="${tests.working.dir}/tests_success.txt" />
507+
</not>
500508
</condition>
501509
</fail>
502510

@@ -555,7 +563,7 @@
555563
<arg line="Start-Process -FilePath OpenSSLTests/OpenSSLTestRunner.exe ${tests.working.dir}" />
556564
</exec>
557565

558-
<waitfor maxwait="4" maxwaitunit="minute">
566+
<waitfor maxwait="5" maxwaitunit="minute">
559567
<or>
560568
<available file="test/tests_success.txt" />
561569
<available file="test/tests_failure.txt" />

‎openssl-air/.idea/runConfigurations/openssl_tests.xml ‎openssl-air/.idea/runConfigurations/openssl_tests_flash.xml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openssl-air/.idea/runConfigurations/openssl_tests_flex.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openssl-air/killme/killme.iml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<content url="file://$MODULE_DIR$">
2020
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
2121
</content>
22-
<orderEntry type="jdk" jdkName="33.0" jdkType="Flex SDK Type (new)" />
2322
<orderEntry type="sourceFolder" forTests="false" />
2423
</component>
2524
</module>

‎openssl-air/openssl-debug-simple/openssl-debug-simple.iml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<content url="file://$MODULE_DIR$">
4646
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
4747
</content>
48-
<orderEntry type="jdk" jdkName="33.0.2.338" jdkType="Flex SDK Type (new)" />
4948
<orderEntry type="sourceFolder" forTests="false" />
5049
<orderEntry type="module-library" exported="">
5150
<library type="flex">

‎openssl-air/openssl-tests-flex/openssl-tests-flex.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency linkage="Merged" />
3434
</entry>
3535
</entries>
36-
<sdk name="32.0.0.116" />
36+
<sdk name="32.0.0" />
3737
</dependencies>
3838
<compiler-options />
3939
<packaging-air-desktop use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/Main-app.xml" package-file-name="OpenSSLTests">
@@ -53,7 +53,7 @@
5353
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
5454
<sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
5555
</content>
56-
<orderEntry type="jdk" jdkName="32.0.0.116&#9;4.16.1-air33" jdkType="__CompositeFlexSdk__" />
56+
<orderEntry type="jdk" jdkName="4.16.1-air33&#9;32.0.0" jdkType="__CompositeFlexSdk__" />
5757
<orderEntry type="sourceFolder" forTests="false" />
5858
<orderEntry type="module-library" exported="">
5959
<library type="flex">

‎openssl-air/openssl-tests-flex/src/TestRunner.as

+35-14
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@
44
package {
55
import com.github.airext.flexunit.listener.CIFileListener;
66
import com.github.airext.openssl.test.Tests;
7+
import com.github.airext.openssl.test.helper.Variants;
78
import com.github.airext.openssl.test.suite.rsa.TestSuiteRSA;
89

10+
import flash.desktop.NativeApplication;
11+
912
import flash.display.Sprite;
13+
import flash.events.InvokeEvent;
1014
import flash.events.UncaughtErrorEvent;
15+
import flash.filesystem.File;
16+
import flash.filesystem.FileMode;
17+
import flash.filesystem.FileStream;
1118
import flash.text.TextField;
1219

1320
import org.flexunit.internals.TraceListener;
@@ -20,17 +27,7 @@ public class TestRunner extends Sprite {
2027
public function TestRunner() {
2128
super();
2229

23-
var handler: Function = function(message: String): void {
24-
trace(message);
25-
tf.text += message + "\n";
26-
};
27-
28-
core = new FlexUnitCore();
29-
30-
core.addListener(new CIFileListener(handler));
31-
core.addListener(new TraceListener());
32-
33-
core.run(Tests);
30+
Variants.generatingDataCount = 256;
3431

3532
var tf: TextField = new TextField();
3633
tf.x = 0;
@@ -39,12 +36,36 @@ public class TestRunner extends Sprite {
3936
tf.height = stage.stageHeight;
4037
addChild(tf);
4138

42-
tf.text += "Tests started\n";
39+
var logFile: File;
4340

44-
tf.text += "TestSuiteRSA: " + TestSuiteRSA + "\n";
41+
var log: Function = function(...args): void {
42+
trace(args);
43+
tf.text += args + "\n";
44+
tf.scrollV = tf.maxScrollV;
45+
46+
if (logFile) {
47+
var fs: FileStream = new FileStream();
48+
fs.open(logFile, FileMode.APPEND);
49+
fs.writeUTFBytes(String(args) + "\n");
50+
fs.close();
51+
}
52+
};
53+
54+
core = new FlexUnitCore();
55+
56+
core.addListener(new CIFileListener(log));
57+
core.addListener(new TraceListener());
58+
59+
core.run(Tests);
60+
61+
log("Tests started");
4562

4663
loaderInfo.uncaughtErrorEvents.addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, function(event: UncaughtErrorEvent): void {
47-
tf.text += event.error + "\n";
64+
log("ERROR: " + event.error);
65+
});
66+
67+
NativeApplication.nativeApplication.addEventListener(InvokeEvent.INVOKE, function(event: InvokeEvent): void {
68+
logFile = new File(event.arguments[0]).resolvePath("tests_log.txt")
4869
});
4970

5071
}

‎openssl-air/openssl-tests-flex/src/com/github/airext/flexunit/listener/CIFileListener.as

+16-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ import org.flexunit.runner.notification.Failure;
1818

1919
import org.flexunit.runner.notification.IAsyncCompletionRunListener;
2020

21+
import skein.utils.delay.callLater;
22+
import skein.utils.delay.delayToTimeout;
23+
2124
public class CIFileListener extends EventDispatcher implements IAsyncCompletionRunListener {
2225

2326
private var successFileName: String;
@@ -44,7 +47,7 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
4447
try {
4548
writeToFile(currentDirectory.resolvePath(successFileName), content);
4649
} catch (error: Error) {
47-
handler("error: " + error);
50+
handler("Error: " + error);
4851
}
4952

5053
}
@@ -53,11 +56,11 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
5356
try {
5457
writeToFile(currentDirectory.resolvePath(failureFileName), content);
5558
} catch (error: Error) {
56-
handler("error: " + error);
59+
handler("Error: " + error);
5760
}
5861
}
5962

60-
private function writeToFile(file: File, content: String): void {
63+
private static function writeToFile(file: File, content: String): void {
6164
var fs: FileStream = new FileStream();
6265
fs.open(file, FileMode.WRITE);
6366
fs.writeUTFBytes(content);
@@ -67,12 +70,13 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
6770
// MARK: - IAsyncCompletionRunListener
6871

6972
public function testRunStarted(description: IDescription): void {
70-
handler("test run started: " + description.displayName);
73+
handler("test run started: " + (description ? description.displayName : null));
7174
}
7275

7376
public function testRunFinished(result: Result): void {
7477
if (result.failureCount == 0) {
7578
writeToSuccessResultFile("OK");
79+
handler("SUCCESS: All Tests Passed");
7680
} else {
7781
var failureContent: String = "";
7882
for each (var failure: Failure in result.failures) {
@@ -81,29 +85,30 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
8185
failureContent += "\t\t" + (failure.exception is ParameterizedAssertionError ? ParameterizedAssertionError(failure.exception).targetException.message : failure.exception.message) + "\n";
8286
}
8387
writeToFailureResultFile(failureContent);
88+
handler("FAILURE: " + failureContent);
8489
}
8590

86-
NativeApplication.nativeApplication.exit();
91+
// NativeApplication.nativeApplication.exit();
8792
}
8893

8994
public function testStarted(description: IDescription): void {
90-
handler("started: " + description.displayName);
95+
handler("started: " + (description ? description.displayName : null));
9196
}
9297

9398
public function testFinished(description: IDescription): void {
94-
handler("finished: " + description.displayName);
99+
handler("finished: " + (description ? description.displayName : null));
95100
}
96101

97102
public function testFailure(failure: Failure): void {
98-
handler("test failure: " + failure.message);
103+
handler("test failure: " + (failure ? failure.message : null));
99104
}
100105

101106
public function testAssumptionFailure(failure: Failure): void {
102-
handler("test failure: " + failure.message);
107+
handler("test failure: " + (failure ? failure.message : null));
103108
}
104109

105110
public function testIgnored(description: IDescription): void {
106-
handler("test ignored: " + description.displayName);
111+
handler("test ignored: " + (description ? description.displayName : null));
107112
}
108113

109114
public function get complete(): Boolean {
@@ -114,6 +119,7 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
114119

115120
private function onInvoke(event: InvokeEvent): void {
116121
handler("invoke arguments: " + event.arguments);
122+
handler("invoke argument count: " + event.arguments.length);
117123
currentDirectory = new File(event.arguments[0]);
118124
}
119125
}

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/Tests.as

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.github.airext.openssl.test {
55
import com.github.airext.openssl.test.suite.hex.TestSuiteHEX;
6+
import com.github.airext.openssl.test.suite.issue.IssuesTestSuite;
67
import com.github.airext.openssl.test.suite.rsa.TestSuiteRSA;
78
import com.github.airext.openssl.test.suite.sha.TestSuiteSHA;
89

@@ -19,5 +20,7 @@ public class Tests {
1920
public var sha: TestSuiteSHA;
2021

2122
public var hex: TestSuiteHEX;
23+
24+
public var issues: IssuesTestSuite;
2225
}
2326
}

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/helper/Variants.as

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/**
2+
* Created by [email protected] on 03.03.2020.
3+
*/
4+
package com.github.airext.openssl.test.helper {
5+
public class Variants {
6+
public static var generatingDataCount: uint = 1024;
7+
}
8+
}

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/suite/hex/TestSuiteHEX.as

+11-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@
22
* Created by [email protected] on 19.02.2020.
33
*/
44
package com.github.airext.openssl.test.suite.hex {
5-
import com.github.airext.openssl.test.suite.hex.theory.TheoryHEX;
5+
import com.github.airext.openssl.test.suite.hex.test.DecodeOddString;
6+
import com.github.airext.openssl.test.suite.hex.theory.SpecialCases;
7+
import com.github.airext.openssl.test.suite.hex.theory.TheoryBytesHEX;
8+
import com.github.airext.openssl.test.suite.hex.theory.TheoryStringsHEX;
69

710
[Suite]
811
[RunWith("org.flexunit.runners.Suite")]
912
public class TestSuiteHEX {
1013

11-
public var theory: TheoryHEX;
14+
public var bytesTheory: TheoryBytesHEX;
15+
16+
public var stringsTheory: TheoryStringsHEX;
17+
18+
public var specialCases: SpecialCases;
19+
20+
public var decodeOddString: DecodeOddString;
1221
}
1322
}

‎openssl-air/openssl-tests-flex/src/com/github/airext/openssl/test/suite/hex/test/DecodeOddString.as

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* Created by [email protected] on 03.03.2020.
3+
*/
4+
package com.github.airext.openssl.test.suite.hex.test {
5+
import com.github.airext.OpenSSL;
6+
7+
import flash.utils.ByteArray;
8+
9+
import org.flexunit.asserts.assertNull;
10+
11+
public class DecodeOddString {
12+
13+
[Test]
14+
public function testDecodeString(): void {
15+
var input: String = "Hello world!";
16+
var encoded: String = OpenSSL.shared.hexFromString(input);
17+
encoded += "x";
18+
var decoded: String = OpenSSL.shared.hexToString(encoded);
19+
20+
assertNull(decoded);
21+
}
22+
23+
[Test]
24+
public function testDecodeBytes(): void {
25+
var input: String = "Hello world!";
26+
var encoded: String = OpenSSL.shared.hexFromString(input);
27+
encoded += "x";
28+
var decoded: ByteArray = OpenSSL.shared.hexToBytes(encoded);
29+
30+
assertNull(decoded);
31+
}
32+
33+
}
34+
}

0 commit comments

Comments
 (0)