clean up rebase

Author: yuzawa-san

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java

@@ -72,20 +72,6 @@ public void testEncodeDefault() {
 
   }
 
-  @Test
-  public void testDecodingException() {
-    Assertions.assertThrows(DecodingException.class, () -> {
-      new GppModel("invalid gpp string").getHeader();
-    });
-  }
-  
-  @Test()
-  public void testDecodeGarbage() {
-    Assertions.assertThrows(DecodingException.class, () -> {
-      new GppModel("z").getUsCtSection();
-    });
-  }
-
   @Test
   public void testEncodeDefaultAll() {
     GppModel gppModel = new GppModel();

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerEncoderTest.java

@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoderTest.java

@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Set;

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoderTest.java

@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Set;