Author: ssmiweve Date: 2009-02-26 10:55:45 +0100 (Thu, 26 Feb 2009) New Revision: 7209
Modified: branches/2.17/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java Log: api breakage in sesat-user-api-1.1-SNAPSHOT Modified: branches/2.17/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java =================================================================== --- branches/2.17/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java 2009-02-24 23:48:13 UTC (rev 7208) +++ branches/2.17/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java 2009-02-26 09:55:45 UTC (rev 7209) @@ -1,4 +1,4 @@ -/* Copyright (2007) Schibsted Søk AS +/* Copyright (2007-2009) Schibsted Søk AS * This file is part of SESAT. * * SESAT is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Affero General Public License * along with SESAT. If not, see <http://www.gnu.org/licenses/>. - * + * * DataModelSerializeTest.java * * Created on 11-Jun-2007, 13:42:18 @@ -80,9 +80,9 @@ */ public class DataModelSerializeTest { - + private static final Logger LOG = Logger.getLogger(DataModelSerializeTest.class); - + private static final String JUNK_YARD_KEY = "foo"; private static final String JUNK_YARD_VALUE = "bar"; private static final int SEARCH_HIT_COUNT = 10; @@ -94,34 +94,34 @@ private static final String QUERY_STRING = "sesam"; private static final String USER_AGENT = "Opera (Linux)"; private static final String REMOTE_ADDRESS = "127.0.0.1"; - + public DataModelSerializeTest() { - + } - + @Test public void testSerialize() throws Exception { final DataModelFactory factory = new DataModelFactoryImpl(new DataModelFactory.Context(){ public Site getSite() { return Site.DEFAULT; } - + public PropertiesLoader newPropertiesLoader(final SiteContext siteCxt, final String resource, final Properties properties) { return TestResourceLoader.newPropertiesLoader(siteCxt, resource, properties); } }); - + final DataModel datamodel = factory.instantiate(); - + final Site site = getTestingSite(); - + final SiteConfiguration.Context cxt = new SiteConfiguration.Context() { public Site getSite() { return site; } - + public PropertiesLoader newPropertiesLoader( final SiteContext siteContext, final String resource, @@ -129,31 +129,31 @@ return TestResourceLoader.newPropertiesLoader(siteContext, resource, properties); } }; - + final SiteConfiguration siteConfig = SiteConfiguration.instanceOf(cxt); - + final SiteDataObject siteDO = factory.instantiate( SiteDataObject.class, datamodel, new DataObject.Property("site", site), new DataObject.Property("siteConfiguration", siteConfig)); datamodel.setSite(siteDO); - + final JunkYardDataObject junkYardDO = factory.instantiate( JunkYardDataObject.class, datamodel, new DataObject.Property("values", new Hashtable<String,Object>())); datamodel.setJunkYard(junkYardDO); - + datamodel.getJunkYard().setValue(JUNK_YARD_KEY, JUNK_YARD_VALUE); - + // final SearchConfiguration searchConfiguration = new StaticCommandConfig(); final ResultList<BasicResultItem> searchResults = new BasicResultList<BasicResultItem>(); searchResults.setHitCount(SEARCH_HIT_COUNT); - + final Set<TokenPredicate> tokenPredicateSet = new HashSet<TokenPredicate>(); tokenPredicateSet.add(TokenPredicate.Categories.FOOD); - + final Clause root = ClauseFactory.createClause(QUERY_STRING, tokenPredicateSet); /* new Clause() { @@ -172,10 +172,10 @@ public void accept(Visitor visitor) { } };*/ - + final ParentFinder parentFinder = new ParentFinder(); - - final Query query = AbstractQuery.createQuery(QUERY_STRING, false, root, parentFinder); + + final Query query = AbstractQuery.createQuery(QUERY_STRING, false, root, parentFinder); /*new AbstractQuery(QUERY_STRING){ public Clause getRootClause(){ return root; @@ -187,14 +187,14 @@ return false; } };*/ - + final QueryDataObject queryDO = factory.instantiate( QueryDataObject.class, datamodel, new DataObject.Property("query", query)); - + datamodel.setQuery(queryDO); - + final SearchDataObject searchDO = factory.instantiate( SearchDataObject.class, datamodel, @@ -202,128 +202,128 @@ new DataObject.Property("results", searchResults), new DataObject.Property("query", queryDO)); datamodel.setSearch(SEARCH_KEY, searchDO); - + final StringDataObject userAgent = factory.instantiate( StringDataObject.class, datamodel, new DataObject.Property("string", USER_AGENT)); - + final StringDataObject remoteAddress = factory.instantiate( StringDataObject.class, datamodel, new DataObject.Property("string", REMOTE_ADDRESS)); - + final BrowserDataObject browserDO = factory.instantiate( BrowserDataObject.class, datamodel, new DataObject.Property("userAgent", userAgent), new DataObject.Property("remoteAddress", remoteAddress)); - + datamodel.setBrowser(browserDO); - + final NavigationConfig navigationConfiguration = new NavigationConfig(null); final Map<String,NavigationItem> navigation = new HashMap<String,NavigationItem>(); final NavigationItem navigationItem = new BasicNavigationItem(NAVIGATION_TITLE, NAVIGATION_URL, NAVIGATION_HIT_COUNT); navigation.put(NAVIGATION_KEY, navigationItem); - + final NavigationDataObject navigationDO = factory.instantiate( NavigationDataObject.class, datamodel, new DataObject.Property("configuration", navigationConfiguration), new DataObject.Property("navigations", navigation)); datamodel.setNavigation(navigationDO); - + final ParametersDataObject parametersDO = factory.instantiate( ParametersDataObject.class, datamodel); datamodel.setParameters(parametersDO); - + final BasicUser user = new TestUser(); - + final UserDataObject userDO = factory.instantiate( UserDataObject.class, datamodel, new DataObject.Property("user", user)); datamodel.setUser(userDO); - + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ObjectOutputStream os = new ObjectOutputStream(baos); - + LOG.info("Serializing datamodel"); os.writeObject(datamodel); - + final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); final ObjectInputStream is = new ObjectInputStream(bais); - + LOG.info("De-serializing datamodel"); final DataModel datamodel2 = (DataModel) is.readObject(); - + assert datamodel2 != null : "is.readObject() returned NULL"; LOG.info("Datamodel: OK"); - + final SiteDataObject siteDO2 = datamodel2.getSite(); assert siteDO2 != null : "siteDO2 == null"; - + final Site site2 = siteDO2.getSite(); assert site2 != null : "site2 == null"; - + assert site.getName().equals(site2.getName()) : "Expected: '" + site.getName() + "', got: '" + site2.getName() + "'"; assert site.getConfigContext().equals(site2.getConfigContext()) : "Expected: '" + site.getConfigContext() + "', got: '" + site2.getName() + "'"; assert site.getTemplateDir().equals(site2.getTemplateDir()) : "Expected: '" + site.getTemplateDir() + "', got: '" + site2.getTemplateDir() + "'"; - + LOG.info("Site: OK"); - + assert datamodel2.getJunkYard() != null : "getJunkYard() returned NULL"; - + assert datamodel2.getJunkYard() instanceof JunkYardDataObject : "expected getJunkYard() to return instance of JunkYardObject, instead it returned: " + datamodel2.getJunkYard().toString(); - + final JunkYardDataObject junkYardDO2 = datamodel2.getJunkYard(); - + assert JUNK_YARD_VALUE.equals(junkYardDO2.getValue(JUNK_YARD_KEY)) : "Expected: '" + JUNK_YARD_VALUE + "', got: '" + junkYardDO2.getValue(JUNK_YARD_KEY) + "'"; LOG.info("Junk yard: OK"); - + assert datamodel2.getSearch(SEARCH_KEY) != null : "datamodel2.getSearch(\"" + SEARCH_KEY + "\") == null"; LOG.info("Search: OK"); - + assert datamodel2.getNavigation() != null : "datamodel2.getNavigation() == null"; - + final Map<String,NavigationItem> navigation2 = datamodel2.getNavigation().getNavigations(); assert navigation2.get(NAVIGATION_KEY) != null : "navigation2.get(" + NAVIGATION_KEY + ") == null"; - + final NavigationItem navigationItem2 = navigation2.get(NAVIGATION_KEY); assert navigationItem2.getTitle().equals(NAVIGATION_TITLE) : "Expected: '" + NAVIGATION_TITLE + "', got: '" + navigationItem2.getTitle() + "'"; assert navigationItem2.getUrl().equals(NAVIGATION_URL) : "Expected: '" + NAVIGATION_URL + "', got: '" + navigationItem2.getUrl() + "'"; assert navigationItem2.getHitCount() == NAVIGATION_HIT_COUNT : "Expected: '" + NAVIGATION_HIT_COUNT + "', got: '" + navigationItem2.getHitCount() + "'"; - + LOG.info("Navigation: OK"); - + assert datamodel2.getQuery() != null : "datamodel2.getQuery()"; - + final Query query2 = datamodel2.getQuery().getQuery(); assert query2.getQueryString().equals(QUERY_STRING) : "Expected: '" + QUERY_STRING + "', got: '" + query2.getQueryString() + "'"; - + LOG.info("Query: OK"); - + final BrowserDataObject browserDO2 = datamodel2.getBrowser(); assert browserDO2 != null : "browserDO2 == null"; assert browserDO2.getUserAgent().getString().equals(USER_AGENT) : "Expected: '" + USER_AGENT + "', got: '" + browserDO2.getUserAgent().getString(); - + LOG.info("Browser: OK"); - + final ParametersDataObject parametersDO2 = datamodel2.getParameters(); assert parametersDO2 != null : "parametersDO2 == null"; - + LOG.info("Parameters: OK"); - + final UserDataObject userDO2 = datamodel2.getUser(); assert userDO2 != null : "userDO2 == null"; LOG.info("User: OK"); } - + protected Site.Context getSiteConstructingContext(){ - + return new Context(){ public String getParentSiteName(final SiteContext siteContext){ // we have to do this manually instead of using SiteConfiguration, @@ -337,38 +337,38 @@ } }; } - + protected Site getTestingSite(){ - + final String basedir = "localhost"; return Site.valueOf( getSiteConstructingContext(), basedir, Locale.getDefault()); - } + } } class TestResourceLoader extends FileResourceLoader { - + private static final Logger LOG = Logger.getLogger(TestResourceLoader.class); - + protected TestResourceLoader(final SiteContext cxt) { super(cxt); } - + public static PropertiesLoader newPropertiesLoader( final SiteContext siteCxt, final String resource, final Properties properties) { - + final PropertiesLoader pl = new TestResourceLoader(siteCxt); return pl; } - + @Override public void init(final String resource, final Properties properties) {} - + private static final Properties props = new Properties(); static { props.setProperty(Site.DEFAULT_SITE_LOCALE_KEY, "no"); @@ -377,12 +377,12 @@ props.setProperty(Site.DEFAULT_SITE_KEY, "localhost"); props.setProperty(Site.PARENT_SITE_KEY, ""); } - + @Override public Properties getProperties() { return props; } - + @Override public void abut() {} } @@ -461,4 +461,16 @@ public boolean isDirty(Date timestamp) { throw new UnsupportedOperationException("Not supported yet."); } + + public String getFullName() { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String getProperty(String key) { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Set<String> getPropertyKeys() { + throw new UnsupportedOperationException("Not supported yet."); + } } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
