Przeglądaj źródła

fix test cases.

Shinsuke Sugaya 11 lat temu
rodzic
commit
e444a78623

+ 4 - 4
src/test/java/jp/sf/fess/helper/impl/QueryHelperImplTest.java

@@ -16,7 +16,7 @@
 
 
 package jp.sf.fess.helper.impl;
 package jp.sf.fess.helper.impl;
 
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 import java.util.Set;
@@ -194,7 +194,7 @@ public class QueryHelperImplTest extends S2TestCase {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
             @Override
             @Override
             public Set<String> build() {
             public Set<String> build() {
-                final Set<String> list = new HashSet<>();
+                final Set<String> list = new LinkedHashSet<>();
                 list.add("guest");
                 list.add("guest");
                 return list;
                 return list;
             }
             }
@@ -216,7 +216,7 @@ public class QueryHelperImplTest extends S2TestCase {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
             @Override
             @Override
             public Set<String> build() {
             public Set<String> build() {
-                final Set<String> list = new HashSet<>();
+                final Set<String> list = new LinkedHashSet<>();
                 list.add("guest");
                 list.add("guest");
                 list.add("admin");
                 list.add("admin");
                 return list;
                 return list;
@@ -248,7 +248,7 @@ public class QueryHelperImplTest extends S2TestCase {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
         queryHelperImpl.roleQueryHelper = new RoleQueryHelper() {
             @Override
             @Override
             public Set<String> build() {
             public Set<String> build() {
-                final Set<String> list = new HashSet<>();
+                final Set<String> list = new LinkedHashSet<>();
                 list.add("guest");
                 list.add("guest");
                 list.add("admin");
                 list.add("admin");
                 return list;
                 return list;

+ 3 - 4
src/test/java/jp/sf/fess/helper/impl/RoleQueryHelperImplTest.java

@@ -20,9 +20,8 @@ import java.util.Set;
 
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.Cookie;
 
 
-import jp.sf.fess.FessSystemException;
-
 import org.codelibs.core.crypto.CachedCipher;
 import org.codelibs.core.crypto.CachedCipher;
+import org.codelibs.core.exception.IllegalBlockSizeRuntimeException;
 import org.seasar.extension.unit.S2TestCase;
 import org.seasar.extension.unit.S2TestCase;
 
 
 public class RoleQueryHelperImplTest extends S2TestCase {
 public class RoleQueryHelperImplTest extends S2TestCase {
@@ -72,7 +71,7 @@ public class RoleQueryHelperImplTest extends S2TestCase {
         try {
         try {
             roleSet = roleQueryHelperImpl.buildByParameter(getRequest());
             roleSet = roleQueryHelperImpl.buildByParameter(getRequest());
             fail();
             fail();
-        } catch (final FessSystemException e) {
+        } catch (final IllegalBlockSizeRuntimeException e) {
             // ok
             // ok
         }
         }
 
 
@@ -134,7 +133,7 @@ public class RoleQueryHelperImplTest extends S2TestCase {
         try {
         try {
             roleSet = roleQueryHelperImpl.buildByHeader(getRequest());
             roleSet = roleQueryHelperImpl.buildByHeader(getRequest());
             fail();
             fail();
-        } catch (final FessSystemException e) {
+        } catch (final IllegalBlockSizeRuntimeException e) {
             // ok
             // ok
         }
         }
 
 

+ 0 - 5
src/test/java/jp/sf/fess/solr/BoostDocumentRuleTest.java

@@ -23,11 +23,6 @@ import org.seasar.extension.unit.S2TestCase;
 
 
 public class BoostDocumentRuleTest extends S2TestCase {
 public class BoostDocumentRuleTest extends S2TestCase {
 
 
-    @Override
-    protected String getRootDicon() throws Throwable {
-        return "jp/sf/fess/crypto/cipher.dicon"; // for ignoring dicon
-    }
-
     public void test_integer() {
     public void test_integer() {
         final BoostDocumentRule docRule = new BoostDocumentRule();
         final BoostDocumentRule docRule = new BoostDocumentRule();
         docRule.setBoostExpression("10");
         docRule.setBoostExpression("10");