diff --git a/build.gradle b/build.gradle index 2e59aa7..8d1b6f9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'jacoco' - id 'com.github.hierynomus.license' version '0.15.0' + id 'com.github.hierynomus.license' version '0.16.1' } group 'org.dcp' @@ -19,5 +19,5 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.12' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..aa991fc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/org/dcp/entities/bit/BitBuffer.java b/src/main/java/org/dcp/entities/bit/BitBuffer.java index ab29362..84a5ae9 100644 --- a/src/main/java/org/dcp/entities/bit/BitBuffer.java +++ b/src/main/java/org/dcp/entities/bit/BitBuffer.java @@ -27,11 +27,11 @@ public BitBuffer(final int sizeInBits) { public BitBuffer(final Iterator bits, final int sizeInBits) { this(sizeInBits); - int indexScanning = 0; + int bitIter = 0; while(bits.hasNext()) { - if(indexScanning >= sizeInBits) + if(bitIter >= sizeInBits) break; - setBit(indexScanning++, bits.next()); + setBit(bitIter++, bits.next()); } } @@ -93,8 +93,7 @@ public BitBuffer subBuffer(final int startIndex, final int endIndexExclusive) { if(endIndexExclusive > sizeInBits) throw new IndexOutOfBoundsException(String.format("End Index out of bounds. EndIndex: %d\n", endIndexExclusive)); final int bitSize = endIndexExclusive - startIndex; - final Iterator iteratorSlice = iterator(startIndex, endIndexExclusive); - return new BitBuffer(iteratorSlice, bitSize); + return new BitBuffer(iterator(startIndex, endIndexExclusive), bitSize); } public BitBuffer subBuffer(final int startIndex) { @@ -129,6 +128,22 @@ public Iterator iterator() { return iterator(0); } + public BitBuffer append(final Iterable appendBits, final int appendSizeInBits) { + final int newSizeInBits = sizeInBits + appendSizeInBits; + final BitBuffer bitBufferNew = new BitBuffer(this, newSizeInBits); + int bitIter = sizeInBits; + for(final Bit bit: appendBits) { + if(bitIter >= newSizeInBits) + break; + bitBufferNew.setBit(bitIter++, bit); + } + return bitBufferNew; + } + + public BitBuffer append(final BitBuffer bitBuffer) { + return append(bitBuffer, bitBuffer.sizeInBits); + } + public String toString() { return StreamSupport.stream(this.spliterator(), false).map(bit -> bit.toString()).collect(Collectors.joining("")); } diff --git a/src/main/java/org/dcp/entities/primitives/Boolean.java b/src/main/java/org/dcp/entities/primitives/Boolean.java index a2f2531..6f41e06 100644 --- a/src/main/java/org/dcp/entities/primitives/Boolean.java +++ b/src/main/java/org/dcp/entities/primitives/Boolean.java @@ -12,7 +12,7 @@ public class Boolean implements BitStreamSerializable { - final boolean value; + private final boolean value; public Boolean(final boolean value) { this.value = value; @@ -35,4 +35,9 @@ public Boolean readFrom(final BitInputStream bitInputStream) { public void writeTo(final BitOutputStream bitOutputStream) { bitOutputStream.writeBit(Bit.valueOf(value)); } + + @Override + public String toString() { + return String.valueOf(value); + } } diff --git a/src/main/java/org/dcp/entities/primitives/Decimal.java b/src/main/java/org/dcp/entities/primitives/Decimal.java index 295670a..3a7f83b 100644 --- a/src/main/java/org/dcp/entities/primitives/Decimal.java +++ b/src/main/java/org/dcp/entities/primitives/Decimal.java @@ -12,7 +12,7 @@ public class Decimal implements BitStreamSerializable { - public enum DecimalFormat { + public static enum DecimalFormat { //Half IEEE_754_HALF_16(1, 5, 10), @@ -95,7 +95,7 @@ public boolean equals(final Object other) { @Override public String toString() { - return String.format("Sign:%s Exponent: %d Mantissa: %d Format: %s", isNegative ? "-" : "+", exponentValue, mantissaValue, format); + return String.format("Sign: %s Exponent: %d Mantissa: %d Format: %s", isNegative ? "-" : "+", exponentValue, mantissaValue, format); } } diff --git a/src/main/java/org/dcp/entities/primitives/Integer.java b/src/main/java/org/dcp/entities/primitives/Integer.java index 88a7ab4..652350a 100644 --- a/src/main/java/org/dcp/entities/primitives/Integer.java +++ b/src/main/java/org/dcp/entities/primitives/Integer.java @@ -12,8 +12,9 @@ public class Integer implements BitStreamSerializable { - final UnsignedInteger unsignedInteger; - final boolean isNegative; + private final UnsignedInteger unsignedInteger; + private final int sizeInBits; + private final boolean isNegative; public Integer(final long integralValue, final int sizeInBits) { isNegative = (integralValue < 0); @@ -21,7 +22,8 @@ public Integer(final long integralValue, final int sizeInBits) { final int sizeInBitsUnsigned = sizeInBits - 1; final long neededSizeInBits = EntropyUtil.findSizeOfBitsToHold(unsignedIntValue); if(neededSizeInBits > sizeInBitsUnsigned) - throw new IllegalArgumentException(String.format("Needed Bits cannot be > than SizeUnsigned. NeededSize: %d SizeUnsigned: %d", neededSizeInBits, sizeInBitsUnsigned)); + throw new IllegalArgumentException(String.format("Size too small to Hold Value. NeededSize: %d SizeUnsigned: %d", neededSizeInBits, sizeInBitsUnsigned)); + this.sizeInBits = sizeInBits; this.unsignedInteger = new UnsignedInteger(unsignedIntValue, sizeInBitsUnsigned); } @@ -30,20 +32,31 @@ public Integer(final int sizeInBits) { } public long value() { - return isNegative? -unsignedInteger.integralValue : unsignedInteger.integralValue; + final long unsignedValue = unsignedInteger.value(); + return isNegative? -unsignedValue : unsignedValue; + } + + public int getSizeInBits() { + return sizeInBits; } @Override - public Integer readFrom(BitInputStream bitInputStream) { + public Integer readFrom(final BitInputStream bitInputStream) { boolean isNegative = bitInputStream.readBit().value(); final UnsignedInteger readInteger = unsignedInteger.readFrom(bitInputStream); - final long integralValue = isNegative? (-readInteger.integralValue): readInteger.integralValue; - return new Integer(integralValue, unsignedInteger.sizeInBits + 1); + final long unsignedValue = readInteger.value(); + final long integralValue = isNegative? -unsignedValue : unsignedValue; + return new Integer(integralValue, readInteger.getSizeInBits() + 1); } @Override - public void writeTo(BitOutputStream bitOutputStream) { + public void writeTo(final BitOutputStream bitOutputStream) { new Boolean(isNegative).writeTo(bitOutputStream); unsignedInteger.writeTo(bitOutputStream); } + + @Override + public String toString() { + return String.valueOf(value()); + } } diff --git a/src/main/java/org/dcp/entities/primitives/UnsignedInteger.java b/src/main/java/org/dcp/entities/primitives/UnsignedInteger.java index 2fe80f3..66f18c1 100644 --- a/src/main/java/org/dcp/entities/primitives/UnsignedInteger.java +++ b/src/main/java/org/dcp/entities/primitives/UnsignedInteger.java @@ -5,17 +5,19 @@ */ package org.dcp.entities.primitives; +import org.dcp.entities.Constants; import org.dcp.entities.bit.Bit; -import org.dcp.entities.bit.BitBuffer; import org.dcp.entities.bit.BitStreamSerializable; import org.dcp.io.BitInputStream; import org.dcp.io.BitOutputStream; import org.dcp.util.EntropyUtil; -public class UnsignedInteger implements BitStreamSerializable { +import java.util.Iterator; - final int sizeInBits; - final long integralValue; +public class UnsignedInteger implements BitStreamSerializable, Iterable { + + private final int sizeInBits; + private final long integralValue; public UnsignedInteger(final long integralValue, final int sizeInBits) { if(integralValue < 0) { @@ -23,7 +25,7 @@ public UnsignedInteger(final long integralValue, final int sizeInBits) { } final long maximumValue = EntropyUtil.findMaximumValueRepresentible(sizeInBits); if(integralValue > maximumValue) - throw new IllegalArgumentException(String.format("Given value cannot be greater than Maximum: %d Value: %d", maximumValue, integralValue)); + throw new IllegalArgumentException(String.format("Value cannot be greater than Maximum: %d. Value: %d", maximumValue, integralValue)); this.integralValue = integralValue; this.sizeInBits = sizeInBits; } @@ -32,29 +34,60 @@ public UnsignedInteger(final int sizeInBits) { this(0, sizeInBits); } + public UnsignedInteger(final Iterable bits, final int sizeInBits) { + final int maxSizeInBits = Constants.BITS_IN_A_INTEGER - 1; + if(sizeInBits > maxSizeInBits) + throw new IllegalArgumentException(String.format("Given Size cannot be greater than Maximum: %d. Size: %d", maxSizeInBits, sizeInBits)); + long integralValue = 0; + long mask = 1L << sizeInBits; + for(final Bit bit: bits) { + mask >>>= 1; + integralValue |= bit.value()? mask : 0; + } + this.integralValue = integralValue; + this.sizeInBits = sizeInBits; + } + public long value() { return integralValue; } + public int getSizeInBits() { + return sizeInBits; + } + @Override - public UnsignedInteger readFrom(BitInputStream bitInputStream) + public Iterator iterator() { + return new Iterator() { + long mask = 1L << sizeInBits; + + @Override + public boolean hasNext() { + return mask != 1; + } + + @Override + public Bit next() { + mask >>>= 1; + return Bit.valueOf( (integralValue & mask) != 0 ); + } + }; + } + + @Override + public UnsignedInteger readFrom(final BitInputStream bitInputStream) { - final Iterable bitsRead = bitInputStream.readBits(this.sizeInBits); - final long readInteger = java.lang.Long.parseUnsignedLong(new BitBuffer(bitsRead, this.sizeInBits).toString(), 2); - return new UnsignedInteger(readInteger, sizeInBits); + return new UnsignedInteger(bitInputStream.readBits(this.sizeInBits), sizeInBits); } @Override - public void writeTo(BitOutputStream bitOutputStream) { - final String binaryString = java.lang.Long.toBinaryString(this.integralValue); - final StringBuilder stringBuilder = new StringBuilder(sizeInBits); - int remainingLength = sizeInBits - binaryString.length(); - while(remainingLength > 0) { - remainingLength--; - stringBuilder.append('0'); - } - stringBuilder.append(binaryString); - bitOutputStream.writeBits(new BitBuffer(stringBuilder.toString())); + public void writeTo(final BitOutputStream bitOutputStream) { + bitOutputStream.writeBits(this); + } + + @Override + public String toString() { + return String.valueOf(value()); } } \ No newline at end of file diff --git a/src/main/java/org/dcp/entities/primitives/VarUnsignedInteger.java b/src/main/java/org/dcp/entities/primitives/VarUnsignedInteger.java new file mode 100644 index 0000000..60f9af4 --- /dev/null +++ b/src/main/java/org/dcp/entities/primitives/VarUnsignedInteger.java @@ -0,0 +1,115 @@ +/** + * Copyright 2019 DataCompressionPrimitives. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + */ +package org.dcp.entities.primitives; + +import org.dcp.entities.bit.Bit; +import org.dcp.entities.bit.BitBuffer; +import org.dcp.entities.bit.BitStreamSerializable; +import org.dcp.io.BitInputStream; +import org.dcp.io.BitOutputStream; + +import java.util.stream.IntStream; + +import static org.dcp.entities.Constants.*; + +public class VarUnsignedInteger implements BitStreamSerializable { + + final UnsignedInteger value; + final int sizeInBits; + final int chunkSizeInBits; + final int chunkValueBits; + + public VarUnsignedInteger(final UnsignedInteger value, final int chunkSizeInBits) { + final int absoluteMinSizeInBits = 2; + if(chunkSizeInBits < absoluteMinSizeInBits) { + throw new IllegalArgumentException(String.format("Given ChunkSize is Lesser than Absolute Minimum: %d. ChunkSize: %d", absoluteMinSizeInBits, chunkSizeInBits)); + } + /* + * This minSizeInBits check is: Are you Sane? and not for correctness. + * + * Why? For very short integers, consider using a fixed size UnsignedInteger. + * Otherwise, if you require Byte-Aligned access, you are wasting space. + */ + final int optimumSizeInBits = BITS_IN_A_BYTE; + if(chunkSizeInBits < optimumSizeInBits) { + throw new IllegalArgumentException(String.format("Given ChunkSize is Lesser than Optimum: %d. Consider Fixed Length. ChunkSize: %d", optimumSizeInBits, chunkSizeInBits)); + } + this.sizeInBits = value.getSizeInBits(); + if(chunkSizeInBits == sizeInBits) { + throw new IllegalArgumentException(String.format("Given ChunkSize is Equal to ValueSize: %d. Consider Fixed Length.", sizeInBits)); + } + if(chunkSizeInBits > sizeInBits) { + throw new IllegalArgumentException(String.format("Given ChunkSize is Greater Size: %d. ChunkSize: %d", sizeInBits, chunkSizeInBits)); + } + this.chunkSizeInBits = chunkSizeInBits; + this.chunkValueBits = chunkSizeInBits - 1; + this.value = value; + } + + public long value() { + return value.value(); + } + + @Override + public VarUnsignedInteger readFrom(final BitInputStream bitInputStream) { + final int numberOfChunks = (sizeInBits / chunkValueBits); + final int leftOverBits = (sizeInBits % chunkValueBits); + final int paddedBits = (leftOverBits == 0)? 0 : (chunkValueBits - leftOverBits); + final int totalNumberOfChunks = numberOfChunks + ((paddedBits > 0)? 1:0); + final int totalNumberOfBits = totalNumberOfChunks * chunkValueBits; + final BitBuffer totalBits = new BitBuffer(totalNumberOfBits); + + int readBits = 0; + int chunkIter = totalNumberOfChunks; + while(chunkIter-- > 0) { + final Bit sentinelBit = bitInputStream.readBit(); + if(chunkIter == 0 && sentinelBit.value()) + throw new IllegalArgumentException(String.format("Did not get End Sentinel in TotalChunks: %d. Size: %d", totalNumberOfChunks, sizeInBits)); + for(final Bit readBit : bitInputStream.readBits(chunkValueBits)) { + totalBits.setBit(readBits++, readBit); + } + if(!sentinelBit.value()) + break; + } + + final BitBuffer readIntegerBits; + if(sizeInBits == readBits) { + readIntegerBits = totalBits.subBuffer(0, readBits); + } else if(readBits < sizeInBits) { + final int bitsToPadLeft = sizeInBits - readBits; + readIntegerBits = new BitBuffer(bitsToPadLeft).append(totalBits, readBits); + } else { + final int bitsToUnpad = readBits - sizeInBits; + readIntegerBits = totalBits.subBuffer(bitsToUnpad, readBits); + } + + final UnsignedInteger unsignedInteger = new UnsignedInteger(readIntegerBits, sizeInBits); + return new VarUnsignedInteger(unsignedInteger, chunkSizeInBits); + } + + @Override + public void writeTo(final BitOutputStream bitOutputStream) { + final int numberOfChunks = (sizeInBits / chunkValueBits); + final int leftOverBits = (sizeInBits % chunkValueBits); + final int paddedBits = (leftOverBits == 0)? 0 : (chunkValueBits - leftOverBits); + final int totalNumberOfChunks = numberOfChunks + ((paddedBits > 0)? 1:0); + final BitBuffer totalBits = (paddedBits > 0)? new BitBuffer(paddedBits).append(value, sizeInBits) : new BitBuffer(value, sizeInBits); + + IntStream.range(0, totalNumberOfChunks).forEach( currentChunk -> { + final int nextChunk = currentChunk + 1; + final int startIndex = currentChunk * chunkValueBits; + final int endIndex = nextChunk * chunkValueBits; + bitOutputStream.writeBit(Bit.valueOf( nextChunk < totalNumberOfChunks ) ); + bitOutputStream.writeBits(() -> totalBits.iterator(startIndex, endIndex)); + }); + } + + @Override + public String toString() { + return String.valueOf(value()); + } + +} \ No newline at end of file diff --git a/src/main/java/org/dcp/entities/Symbol.java b/src/main/java/org/dcp/entities/symbol/Symbol.java similarity index 95% rename from src/main/java/org/dcp/entities/Symbol.java rename to src/main/java/org/dcp/entities/symbol/Symbol.java index 2ac7361..2ce208b 100644 --- a/src/main/java/org/dcp/entities/Symbol.java +++ b/src/main/java/org/dcp/entities/symbol/Symbol.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); */ -package org.dcp.entities; +package org.dcp.entities.symbol; import org.dcp.entities.bit.BitStreamSerializable; diff --git a/src/main/java/org/dcp/io/BitInputStream.java b/src/main/java/org/dcp/io/BitInputStream.java index 5acc9db..633afbd 100644 --- a/src/main/java/org/dcp/io/BitInputStream.java +++ b/src/main/java/org/dcp/io/BitInputStream.java @@ -7,24 +7,32 @@ import org.dcp.entities.bit.Bit; -import java.util.ArrayList; -import java.util.List; +import java.util.Iterator; public interface BitInputStream { public Bit readBit(); - public default Iterable readBits(int toRead) { - final List readBits = new ArrayList(toRead); - for(int readIter = 0; readIter < toRead; ++readIter) { - readBits.add(readBit()); - } - return readBits; + public default Iterable readBits(final int toRead) { + return () -> { + return new Iterator() { + int readIter = 0; + + @Override + public boolean hasNext() { + return (readIter < toRead); + } + + @Override + public Bit next() { + ++readIter; + return readBit(); + } + }; + }; } - public default void skipBits(int toRead) { - for(int readIter = 0; readIter < toRead; ++readIter) { - readBit(); - } + public default void skipBits(final int toRead) { + readBits(toRead).forEach(bit -> {}); } } diff --git a/src/main/java/org/dcp/io/BitOutputStream.java b/src/main/java/org/dcp/io/BitOutputStream.java index a118813..3aa8142 100644 --- a/src/main/java/org/dcp/io/BitOutputStream.java +++ b/src/main/java/org/dcp/io/BitOutputStream.java @@ -13,9 +13,7 @@ public interface BitOutputStream extends Closeable { public void writeBit(final Bit bit); public default void writeBits(final Iterable bits) { - for(final Bit bit: bits) { - writeBit(bit); - } + bits.forEach(bit -> writeBit(bit)); } @Override diff --git a/src/main/java/org/dcp/io/impl/ChannelBitInputStream.java b/src/main/java/org/dcp/io/impl/ChannelBitInputStream.java index 14e36ef..e161069 100644 --- a/src/main/java/org/dcp/io/impl/ChannelBitInputStream.java +++ b/src/main/java/org/dcp/io/impl/ChannelBitInputStream.java @@ -33,11 +33,11 @@ protected byte readByte() { final int count; try { count = byteChannel.read(buffer); - } catch (IOException e) { - throw new IllegalStateException(e); + } catch (IOException ioException) { + throw new IllegalStateException(ioException); } if (count < 1) { - throw new IllegalStateException(); + throw new IllegalStateException("Unable to read from ReadableByteChannel."); } } final byte readByte = buffer.get(0); @@ -51,10 +51,10 @@ public Bit readBit() { current = readByte(); } final Bit readBit = Bit.valueOf((current & mask) != 0); - if (mask == LAST_BIT) { - mask = FIRST_BIT; - } else { + if (mask != LAST_BIT) { mask >>>= 1; + } else { + mask = FIRST_BIT; } return readBit; } diff --git a/src/main/java/org/dcp/io/impl/ChannelBitOutputStream.java b/src/main/java/org/dcp/io/impl/ChannelBitOutputStream.java index a33898d..1bd4a97 100644 --- a/src/main/java/org/dcp/io/impl/ChannelBitOutputStream.java +++ b/src/main/java/org/dcp/io/impl/ChannelBitOutputStream.java @@ -32,8 +32,8 @@ protected void writeByte(byte byteWrite) { buffer.put(0, byteWrite); try { byteChannel.write(buffer); - } catch (IOException e) { - throw new IllegalStateException(e); + } catch (IOException ioException) { + throw new IllegalStateException(ioException); } buffer.rewind(); } @@ -43,12 +43,12 @@ public void writeBit(Bit bit) { if (bit.value()) { current |= mask; } - if (mask == LAST_BIT) { + if (mask != LAST_BIT) { + mask >>>= 1; + } else { writeByte(current); mask = FIRST_BIT; current = 0; - } else { - mask >>>= 1; } } @@ -56,8 +56,8 @@ public void writeBit(Bit bit) { public void flushBits() { if(mask != LAST_BIT) { writeByte(current); + mask = FIRST_BIT; + current = 0; } - mask = FIRST_BIT; - current = 0; } } diff --git a/src/main/java/org/dcp/util/EntropyUtil.java b/src/main/java/org/dcp/util/EntropyUtil.java index 1d88677..ed1a2de 100644 --- a/src/main/java/org/dcp/util/EntropyUtil.java +++ b/src/main/java/org/dcp/util/EntropyUtil.java @@ -50,4 +50,4 @@ public static BigInteger findMaximumValueRepresentibleBig(final int sizeInBits) return BigInteger.ONE.shiftLeft(sizeInBits).subtract(BigInteger.ONE); } -} +} \ No newline at end of file diff --git a/src/test/java/org/dcp/test/entities/BitBufferTest.java b/src/test/java/org/dcp/test/entities/BitBufferTest.java index da7fcce..1dd2097 100644 --- a/src/test/java/org/dcp/test/entities/BitBufferTest.java +++ b/src/test/java/org/dcp/test/entities/BitBufferTest.java @@ -78,6 +78,14 @@ public void testSliceFunctionality() { assertEquals(bitBufferSliceSmall.toString(), "01010101"); } + @Test + public void testAppendFunctionality() { + final int sizeInBits = 4; + final BitBuffer bitBuffer = new BitBuffer(sizeInBits); + assertEquals(bitBuffer.toString(), "0000"); + assertEquals(bitBuffer.append(new BitBuffer("11")).toString(), "000011"); + } + @Test public void testReadStringFunctionality() { final String integerToString = Long.toBinaryString(32); diff --git a/src/test/java/org/dcp/test/entities/BitTest.java b/src/test/java/org/dcp/test/entities/BitTest.java index c145696..a3fff39 100644 --- a/src/test/java/org/dcp/test/entities/BitTest.java +++ b/src/test/java/org/dcp/test/entities/BitTest.java @@ -23,5 +23,25 @@ public void testBasicFunctionality() { assertEquals(bitSecond.value(), true); assertEquals(bitSecond.intValue(), 1); assertEquals(bitSecond.toString(), "1"); + + final Bit bitThird = Bit.valueOf(0); + assertEquals(bitThird.value(), false); + assertEquals(bitThird.intValue(), 0); + assertEquals(bitThird.toString(), "0"); + + final Bit bitFourth = Bit.valueOf(1); + assertEquals(bitFourth.value(), true); + assertEquals(bitFourth.intValue(), 1); + assertEquals(bitFourth.toString(), "1"); + + final Bit bitFifth = Bit.valueOf("0"); + assertEquals(bitFifth.value(), false); + assertEquals(bitFifth.intValue(), 0); + assertEquals(bitFifth.toString(), "0"); + + final Bit bitSixth = Bit.valueOf("1"); + assertEquals(bitSixth.value(), true); + assertEquals(bitSixth.intValue(), 1); + assertEquals(bitSixth.toString(), "1"); } } \ No newline at end of file diff --git a/src/test/java/org/dcp/test/entities/primitives/IntegerTest.java b/src/test/java/org/dcp/test/entities/primitives/IntegerTest.java index 516da26..c4c9b3c 100644 --- a/src/test/java/org/dcp/test/entities/primitives/IntegerTest.java +++ b/src/test/java/org/dcp/test/entities/primitives/IntegerTest.java @@ -17,15 +17,13 @@ public class IntegerTest { - final int sizeInBits = 4; - @Test public void testBasicFunctionality() { - final Integer integerDefault = new Integer(sizeInBits); + final Integer integerDefault = new Integer(4); assertEquals(integerDefault.value(), 0); try { - final Integer integerUnParsable = new Integer(19, sizeInBits); + final Integer integerUnParsable = new Integer(19, 4); assertTrue(false); } catch(IllegalArgumentException ie) { //Good! diff --git a/src/test/java/org/dcp/test/entities/primitives/UnsignedIntegerTest.java b/src/test/java/org/dcp/test/entities/primitives/UnsignedIntegerTest.java index 0956ffd..1f3d08e 100644 --- a/src/test/java/org/dcp/test/entities/primitives/UnsignedIntegerTest.java +++ b/src/test/java/org/dcp/test/entities/primitives/UnsignedIntegerTest.java @@ -16,22 +16,20 @@ public class UnsignedIntegerTest { - final int sizeInBits = 4; - @Test public void testBasicFunctionality() { - final UnsignedInteger unsignedIntegerDefault = new UnsignedInteger(sizeInBits); + final UnsignedInteger unsignedIntegerDefault = new UnsignedInteger(4); assertEquals(unsignedIntegerDefault.value(), 0); try { - final UnsignedInteger unsignedIntegerUnParsable = new UnsignedInteger(19, sizeInBits); + final UnsignedInteger unsignedIntegerUnParsable = new UnsignedInteger(19, 4); assertTrue(false); } catch(IllegalArgumentException ie) { //Good! } try { - final UnsignedInteger unsignedIntegernegative = new UnsignedInteger(-5, sizeInBits); + final UnsignedInteger unsignedIntegernegative = new UnsignedInteger(-5, 4); assertTrue(false); } catch(IllegalArgumentException ie) { //Good! @@ -53,10 +51,12 @@ public void testReadFunctionality() { @Test public void testWriteFunctionality() { final BitOutputStream bitOutputStreamFirst = new MockBitOutputStream(); + new UnsignedInteger(1, 1).writeTo(bitOutputStreamFirst); + assertEquals(bitOutputStreamFirst.toString(), "1"); new UnsignedInteger(13, 4).writeTo(bitOutputStreamFirst); - assertEquals(bitOutputStreamFirst.toString(), "1101"); + assertEquals(bitOutputStreamFirst.toString(), "11101"); new UnsignedInteger(11, 4).writeTo(bitOutputStreamFirst); - assertEquals(bitOutputStreamFirst.toString(), "11011011"); + assertEquals(bitOutputStreamFirst.toString(), "111011011"); final BitOutputStream bitOutputStreamSecond = new MockBitOutputStream(); new UnsignedInteger(0, 19).writeTo(bitOutputStreamSecond); diff --git a/src/test/java/org/dcp/test/entities/primitives/VarUnsignedIntegerTest.java b/src/test/java/org/dcp/test/entities/primitives/VarUnsignedIntegerTest.java new file mode 100644 index 0000000..1900a54 --- /dev/null +++ b/src/test/java/org/dcp/test/entities/primitives/VarUnsignedIntegerTest.java @@ -0,0 +1,100 @@ +/** + * Copyright 2019 DataCompressionPrimitives. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + */ +package org.dcp.test.entities.primitives; + +import org.dcp.entities.primitives.UnsignedInteger; +import org.dcp.entities.primitives.VarUnsignedInteger; +import org.dcp.io.BitInputStream; +import org.dcp.io.BitOutputStream; +import org.dcp.io.impl.MockBitInputStream; +import org.dcp.io.impl.MockBitOutputStream; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class VarUnsignedIntegerTest { + + @Test + public void testBasicFunctionality() { + try { + final VarUnsignedInteger varUnsignedIntegerTooSmall = new VarUnsignedInteger( new UnsignedInteger(231, 12), 1); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + try { + final VarUnsignedInteger varUnsignedIntegerTooUnoptimal = new VarUnsignedInteger( new UnsignedInteger(231, 12), 2); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + try { + final VarUnsignedInteger varUnsignedIntegerBorderLine = new VarUnsignedInteger( new UnsignedInteger(231, 12), 7); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + try { + final VarUnsignedInteger varUnsignedIntegerBorderLine = new VarUnsignedInteger( new UnsignedInteger(231, 12), 7); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + final VarUnsignedInteger varUnsignedIntegerDefault = new VarUnsignedInteger( new UnsignedInteger(231, 12), 8); + assertEquals(varUnsignedIntegerDefault.value(), 231); + + try { + final VarUnsignedInteger varUnsignedIntegerTooBig = new VarUnsignedInteger( new UnsignedInteger(231, 12), 12); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + try { + final VarUnsignedInteger varUnsignedIntegerTooBigAgain = new VarUnsignedInteger( new UnsignedInteger(231, 12), 13); + assertTrue(false); + } catch(IllegalArgumentException ie) { + //Good! + } + + } + + @Test + public void testReadFunctionality() { + final BitInputStream bitInputStreamFirst = new MockBitInputStream("1000000000000111"); + final VarUnsignedInteger varUnsignedIntegerFirst = new VarUnsignedInteger(new UnsignedInteger(0, 12), 8).readFrom(bitInputStreamFirst); + assertEquals(varUnsignedIntegerFirst.value(), 7); + + final BitInputStream bitInputStreamSecond = new MockBitInputStream("00000111"); + final VarUnsignedInteger varUnsignedIntegerSecond = new VarUnsignedInteger(new UnsignedInteger(0, 12), 8).readFrom(bitInputStreamSecond); + assertEquals(varUnsignedIntegerSecond.value(), 7); + + final BitInputStream bitInputStreamThird = new MockBitInputStream("00000111"); + final VarUnsignedInteger varUnsignedIntegerThird = new VarUnsignedInteger(new UnsignedInteger(0, 18), 8).readFrom(bitInputStreamThird); + assertEquals(varUnsignedIntegerThird.value(), 7); + + final BitInputStream bitInputStreamFourth = new MockBitInputStream("1000000000000111"); + final VarUnsignedInteger varUnsignedIntegerFourth = new VarUnsignedInteger(new UnsignedInteger(0, 14), 8).readFrom(bitInputStreamFourth); + assertEquals(varUnsignedIntegerFourth.value(), 7); + } + + @Test + public void testWriteFunctionality() { + final BitOutputStream bitOutputStreamFirst = new MockBitOutputStream(); + new VarUnsignedInteger(new UnsignedInteger(7, 12), 8).writeTo(bitOutputStreamFirst); + assertEquals(bitOutputStreamFirst.toString(), "1000000000000111"); + + final BitOutputStream bitOutputStreamSecond = new MockBitOutputStream(); + new VarUnsignedInteger(new UnsignedInteger(91, 13), 8).writeTo(bitOutputStreamSecond); + assertEquals(bitOutputStreamSecond.toString(), "1000000001011011"); + } + +} diff --git a/src/test/java/org/dcp/test/io/impl/ChannelBitOutputStreamTest.java b/src/test/java/org/dcp/test/io/impl/ChannelBitOutputStreamTest.java index fd0065b..203af23 100644 --- a/src/test/java/org/dcp/test/io/impl/ChannelBitOutputStreamTest.java +++ b/src/test/java/org/dcp/test/io/impl/ChannelBitOutputStreamTest.java @@ -34,10 +34,17 @@ public void testWriteBitsFunctionality() { final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); final WritableByteChannel channel = Channels.newChannel(outputStream); final BitOutputStream bitOutputStream = new ChannelBitOutputStream(channel); - final BitBuffer bitBuffer = new BitBuffer("001001"); + final BitBuffer bitBuffer = new BitBuffer("00100100"); bitOutputStream.writeBits(bitBuffer); - bitOutputStream.flushBits(); assertEquals(outputStream.toByteArray()[0], (byte) 0b00100100); } -} + @Test + public void testCloseFunctionality() { + final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + final WritableByteChannel channel = Channels.newChannel(outputStream); + try(final BitOutputStream bitOutputStream = new ChannelBitOutputStream(channel)) { + } + } + +} \ No newline at end of file diff --git a/src/test/java/org/dcp/test/io/impl/MockBitOutputStreamTest.java b/src/test/java/org/dcp/test/io/impl/MockBitOutputStreamTest.java index 6b952f9..239d21a 100644 --- a/src/test/java/org/dcp/test/io/impl/MockBitOutputStreamTest.java +++ b/src/test/java/org/dcp/test/io/impl/MockBitOutputStreamTest.java @@ -38,6 +38,12 @@ public void testFlushFunctionality(){ bitOutputStream.writeBits(bitBuffer); bitOutputStream.flushBits(); assertEquals(bitOutputStream.toString(), bitBuffer.toString() + "00"); + + final BitOutputStream bitOutputStreamSecond = new MockBitOutputStream(); + final BitBuffer bitBufferSecond = new BitBuffer("00100100"); + bitOutputStreamSecond.writeBits(bitBufferSecond); + bitOutputStreamSecond.flushBits(); + assertEquals(bitOutputStreamSecond.toString(), bitBufferSecond.toString()); } }