Added EUI48Sub and EUI48::indexOf(const EUI48Sub& other) and contains(const EUI48Sub& other) (C++ and Java, both w/ unit tests)v2.2.0

2 files changed, 171 insertions, 0 deletions

diff --git a/test/direct_bt/test_btaddress01.cpp b/test/direct_bt/test_btaddress01.cpp
index 3c2896b0..1f4df2eb 100644
--- a/test/direct_bt/test_btaddress01.cpp
+++ b/test/direct_bt/test_btaddress01.cpp
@@ -9,11 +9,44 @@
 #include <jau/test/catch2_ext.hpp>
 
 #include <jau/basic_types.hpp>
+#include <jau/darray.hpp>
 #include <direct_bt/BTAddress.hpp>
 
 using namespace direct_bt;
 using namespace jau;
 
+static void test_sub(const std::string& mac_str, const jau::darray<std::string>& mac_sub_strs, const jau::darray<jau::snsize_t>& indices) {
+    const EUI48 mac(mac_str);
+    printf("Test EUI48 mac: '%s' -> '%s'\n", mac_str.c_str(), mac.toString().c_str());
+    REQUIRE(mac_str == mac.toString());
+
+    int i=0;
+    jau::for_each_const(mac_sub_strs, [&i, &mac, &indices](const std::string &mac_sub_str) {
+        const EUI48Sub mac_sub(mac_sub_str);
+        printf("EUI48Sub mac02_sub: '%s' -> '%s'\n", mac_sub_str.c_str(), mac_sub.toString().c_str());
+        // cut-off pre- and post-colon in test string
+        std::string sub_str = mac_sub_str;
+        if( sub_str.size() > 0 && sub_str[0] == ':' ) {
+            sub_str = sub_str.substr(1, sub_str.size());
+        }
+        if( sub_str.size() > 0 && sub_str[sub_str.size()-1] == ':' ) {
+            sub_str = sub_str.substr(0, sub_str.size()-1);
+        }
+        REQUIRE(sub_str == mac_sub.toString());
+
+        jau::snsize_t idx = mac.indexOf(mac_sub);
+        REQUIRE( idx == indices.at(i));
+        if( idx >= 0 ) {
+            REQUIRE( mac.contains(mac_sub) );
+        } else {
+            REQUIRE( !mac.contains(mac_sub) );
+        }
+
+        ++i;
+    } );
+    (void) indices;
+}
+
 TEST_CASE( "EUI48 Test 01", "[datatype][eui48]" ) {
     EUI48 mac01;
     INFO_STR("EUI48 size: whole0 "+std::to_string(sizeof(EUI48)));
@@ -21,4 +54,20 @@ TEST_CASE( "EUI48 Test 01", "[datatype][eui48]" ) {
     INFO_STR("EUI48 size:  data1 "+std::to_string(sizeof(mac01.b)));
     REQUIRE_MSG("EUI48 struct and data size match", sizeof(EUI48) == sizeof(mac01));
     REQUIRE_MSG("EUI48 struct and data size match", sizeof(mac01) == sizeof(mac01.b));
+
+    {
+        // index                      [high=5 ...   low=0]
+        const std::string mac02_str = "C0:10:22:A0:10:00";
+        const jau::darray<std::string> mac02_sub_strs = { "C0", "C0:10", ":10:22", "10:22", ":10:22:", "10:22:", "10", "10:00", "00", ":", "", "00:10", mac02_str};
+        const jau::darray<jau::snsize_t> mac02_sub_idxs = {  5,       4,        3,       3,         3,        3,    1,       0,    0,   0,  0,      -1,         0};
+        test_sub(mac02_str, mac02_sub_strs, mac02_sub_idxs);
+    }
+
+    {
+        // index                      [high=5 ...   low=0]
+        const std::string mac03_str = "01:02:03:04:05:06";
+        const jau::darray<std::string> mac03_sub_strs = { "01", "01:02", ":03:04", "03:04", ":04:05:", "04:05:", "04", "05:06", "06", ":", "", "06:05", mac03_str};
+        const jau::darray<jau::snsize_t> mac03_sub_idxs = {  5,       4,        2,       2,         1,        1,    2,       0,    0,   0,  0,      -1,         0};
+        test_sub(mac03_str, mac03_sub_strs, mac03_sub_idxs);
+    }
 }
diff --git a/test/java/test/org/direct_bt/TestEUI48.java b/test/java/test/org/direct_bt/TestEUI48.java
new file mode 100644
index 00000000..e3551665
--- /dev/null
+++ b/test/java/test/org/direct_bt/TestEUI48.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2015 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package test.org.direct_bt;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Test;
+import org.direct_bt.BTException;
+import org.direct_bt.BTFactory;
+import org.direct_bt.BTManager;
+import org.direct_bt.EUI48;
+import org.direct_bt.EUI48Sub;
+import org.jau.junit.util.JunitTracer;
+import org.junit.Assert;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+/**
+ * Test basic EUI48 functionality
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestEUI48 extends JunitTracer {
+
+    static {
+        final BTManager manager;
+        try {
+            manager = BTFactory.getDirectBTBluetoothManager();
+        } catch (BTException | NoSuchMethodException | SecurityException
+                | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException | ClassNotFoundException e) {
+            System.err.println("Unable to instantiate DirectBT BluetoothManager");
+            e.printStackTrace();
+            System.exit(-1);
+        }
+    }
+    static void test_sub(final String mac_str, final List<String> mac_sub_strs, final List<Integer> indices) {
+        final EUI48 mac = new EUI48(mac_str);
+
+        System.out.printf("Test EUI48 mac: '%s' -> '%s'\n", mac_str, mac.toString());
+        Assert.assertEquals(mac_str, mac.toString());
+
+        int i=0;
+        for(final Iterator<String> iter=mac_sub_strs.iterator(); iter.hasNext(); ++i) {
+            final String mac_sub_str = iter.next();
+            final EUI48Sub mac_sub = new EUI48Sub(mac_sub_str);
+            System.out.printf("EUI48Sub mac02_sub: '%s' -> '%s'\n", mac_sub_str, mac_sub.toString());
+            // cut-off pre- and post-colon in test string
+            String sub_str = mac_sub_str;
+            if( sub_str.length() > 0 && sub_str.charAt(0) == ':' ) {
+                sub_str = sub_str.substring(1, sub_str.length());
+            }
+            if( sub_str.length() > 0 && sub_str.charAt(sub_str.length()-1) == ':' ) {
+                sub_str = sub_str.substring(0, sub_str.length()-1);
+            }
+            Assert.assertEquals(sub_str, mac_sub.toString());
+
+            final int idx = mac.indexOf(mac_sub);
+            Assert.assertEquals( idx, indices.get(i).intValue());
+            if( idx >= 0 ) {
+                Assert.assertTrue( mac.contains(mac_sub) );
+            } else {
+                Assert.assertFalse( mac.contains(mac_sub) );
+            }
+        }
+    }
+
+    @Test
+    public void test01_EUI48AndSub() {
+        {
+            // index                      [high=5 ...   low=0]
+            final String mac02_str = "C0:10:22:A0:10:00";
+            final String[] mac02_sub_strs = { "C0", "C0:10", ":10:22", "10:22", ":10:22:", "10:22:", "10", "10:00", "00", ":", "", "00:10", mac02_str};
+            final Integer[] mac02_sub_idxs = {  5,       4,        3,       3,         3,        3,    1,       0,    0,   0,  0,      -1,         0};
+            test_sub(mac02_str, Arrays.asList(mac02_sub_strs), Arrays.asList(mac02_sub_idxs));
+        }
+
+        {
+            // index                      [high=5 ...   low=0]
+            final String mac03_str = "01:02:03:04:05:06";
+            final String[] mac03_sub_strs = { "01", "01:02", ":03:04", "03:04", ":04:05:", "04:05:", "04", "05:06", "06", ":", "", "06:05", mac03_str};
+            final Integer[] mac03_sub_idxs = {  5,       4,        2,       2,         1,        1,    2,       0,    0,   0,  0,      -1,         0};
+            test_sub(mac03_str, Arrays.asList(mac03_sub_strs), Arrays.asList(mac03_sub_idxs));
+        }
+    }
+
+    public static void main(final String args[]) throws IOException {
+        final String tstname = TestEUI48.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
+
+}