Skip to content
This repository was archived by the owner on Nov 20, 2025. It is now read-only.

CT-3631 Fix OSX build #1

Open
vrahane wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CT-3631 Fix OSX build #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca5190
CT-3631 Fix OSX build
Sep 28, 2021
65ed634
CT-3631 Update README for dependencies
Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ will depend on what you want to achieve.
card yet - then you might want to read the design notes below and then check
out the JavaDocs.

### Pre-requisites and Dependencies
Java 1.8.0 from Oracle
https://www.oracle.com/java/technologies/javase/javase8u211-later-archive-downloads.html

### Building

We use [Gradle](https://gradle.org). The repository contains a Gradle wrapper
Expand Down
2 changes: 1 addition & 1 deletion identiv-oacf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ tasks.withType(JavaCompile) {

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
testCompile "com.idondemand:util:0.0.16"
//testCompile "com.idondemand:util:0.0.16"
}


Expand Down
41 changes: 25 additions & 16 deletions identiv-oacf/src/test/groovy/com/identiv/shared/formats/EncodingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
package com.identiv.shared.formats

import com.google.protobuf.ByteString
import com.idondemand.client.utils.Hex
import org.apache.commons.codec.binary.Hex;
import spock.lang.Specification
import org.apache.commons.codec.DecoderException;


import static com.identiv.shared.formats.OpenAccessCredentialFormat.CredentialEnvelope;
Expand All @@ -26,10 +27,18 @@ import static com.identiv.shared.formats.OpenAccessCredentialFormat.CredentialEn
*/
class EncodingTest extends Specification {

public static byte[] decodeHex(String input) {
try {
return Hex.decodeHex(input.toCharArray());
} catch (DecoderException e) {
throw new IllegalStateException("Hex Decoder exception", e);
}
}

void "simple format examples"(String payload, String result) {
when:
// encode
byte[] payloadBytes = Hex.decode(payload)
byte[] payloadBytes = decodeHex(payload)
OpenAccessCredentialFormat.CredentialEnvelope envelope =
OpenAccessCredentialFormat.CredentialEnvelope.newBuilder()
.setDefaultPacsRecord(
Expand All @@ -45,21 +54,21 @@ class EncodingTest extends Specification {
.getWiegandData().toByteArray()

then:
Hex.encode(envelopeBytes) == result
Hex.encode(decoded) == payload
Hex.encodeHexString(envelopeBytes) == result
Hex.encodeHexString(decoded) == payload

where:
payload || result
"250000000150" || "0A082206250000000150"
"230028001A60" || "0A082206230028001A60"
"1A00110011" || "0A0722051A00110011"
"2502479D9970" || "0A0822062502479D9970"
"250000000150" || "0a082206250000000150"
"230028001a60" || "0a082206230028001a60"
"1a00110011" || "0a0722051a00110011"
"2502479d9970" || "0a0822062502479d9970"

}

void "complex format examples"(String payload, String uid, String result) {
when:
byte[] payloadBytes = Hex.decode(payload)
byte[] payloadBytes = decodeHex(payload)
OpenAccessCredentialFormat.CredentialEnvelope envelope =
OpenAccessCredentialFormat.CredentialEnvelope.newBuilder()
.setDefaultPacsRecord(
Expand All @@ -70,20 +79,20 @@ class EncodingTest extends Specification {
.setToken(
OpenAccessCredentialFormat.TokenInfo.newBuilder()
.setUid(ByteString.copyFrom(
Hex.decode(uid)))
decodeHex(uid)))
.build())
.build();
byte[] envelopeBytes = envelope.toByteArray()
then:
Hex.encode(envelopeBytes) == result
Hex.encodeHexString(envelopeBytes) == result
where:
payload | uid || result
"250000000150" | "0001020304050607" ||
"0A0822062500000001501A0A3A080001020304050607"
"230028001A60" | "0102030405060708" ||
"0A082206230028001A601A0A3A080102030405060708"
"1A00110011" | "0203040506070809" ||
"0A0722051A001100111A0A3A080203040506070809"
"0a0822062500000001501a0a3a080001020304050607"
"230028001a60" | "0102030405060708" ||
"0a082206230028001a601a0a3a080102030405060708"
"1a00110011" | "0203040506070809" ||
"0a0722051a001100111a0a3a080203040506070809"
}

}
29 changes: 19 additions & 10 deletions identiv-oacf/src/test/java/com/identiv/shared/formats/EnvelopeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,26 @@
package com.identiv.shared.formats;

import com.google.protobuf.ByteString;
import com.idondemand.client.utils.Hex;
import org.apache.commons.codec.binary.Hex;
import org.junit.Test;
import org.apache.commons.codec.DecoderException;

/**
*/
public class EnvelopeTest {

public static byte[] decodeHex(String input) {
try {
return Hex.decodeHex(input.toCharArray());
} catch (DecoderException e) {
throw new IllegalStateException("Hex Decoder exception", e);
}
}

@Test
public void formatDemo() {
// 3535D (4050, 1000000)
byte[] fixedBytes = Hex.decode("23FF4BD09000");
byte[] fixedBytes = decodeHex("23FF4BD09000");

OpenAccessCredentialFormat.PacsRecord pacsRecord =
OpenAccessCredentialFormat.PacsRecord.newBuilder()
Expand All @@ -39,14 +48,14 @@ public void formatDemo() {
.build();

System.out.println(envelope.toString());
System.out.println("************" + Hex.encode(fixedBytes));
System.out.println(Hex.encode(envelope.toByteArray()));
System.out.println("************" + Hex.encodeHexString(fixedBytes));
System.out.println(Hex.encodeHexString(envelope.toByteArray()));
}

@Test
public void formatDemo37DNoChecksum() {
// 37D (17265057273)
byte[] fixedBytes = Hex.decode("25C0513DDF98");
byte[] fixedBytes = decodeHex("25C0513DDF98");

OpenAccessCredentialFormat.CredentialEnvelope envelope =
OpenAccessCredentialFormat.CredentialEnvelope.newBuilder()
Expand All @@ -57,13 +66,13 @@ public void formatDemo37DNoChecksum() {
.build();

System.out.println(envelope.toString());
System.out.println("************" + Hex.encode(fixedBytes));
System.out.println(Hex.encode(envelope.toByteArray()));
System.out.println("************" + Hex.encodeHexString(fixedBytes));
System.out.println(Hex.encodeHexString(envelope.toByteArray()));
}

@Test
public void bigDemo() {
byte[] fixedBytes = Hex.decode("25C0513DDF98");
byte[] fixedBytes = decodeHex("25C0513DDF98");

OpenAccessCredentialFormat.CredentialEnvelope envelope =
OpenAccessCredentialFormat.CredentialEnvelope.newBuilder()
Expand All @@ -79,8 +88,8 @@ public void bigDemo() {
.build();

System.out.println(envelope.toString());
System.out.println("************" + Hex.encode(fixedBytes));
System.out.println(Hex.encode(envelope.toByteArray()));
System.out.println("************" + Hex.encodeHexString(fixedBytes));
System.out.println(Hex.encodeHexString(envelope.toByteArray()));
}

}