Removed stray @gwt.typeArgs; sort & format. git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1719 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/junit/client/TestResults.java b/user/src/com/google/gwt/junit/client/TestResults.java index f2b92f3..74ebccb 100644 --- a/user/src/com/google/gwt/junit/client/TestResults.java +++ b/user/src/com/google/gwt/junit/client/TestResults.java
@@ -1,12 +1,12 @@ /* - * Copyright 2007 Google Inc. - * + * Copyright 2008 Google Inc. + * * 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 - * + * * http://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 @@ -25,7 +25,7 @@ * is constructed transparently within a benchmark and reported back to the * JUnit RPC server, JUnitHost. It's then shared (via JUnitMessageQueue) with * JUnitShell and aggregated in BenchmarkReport with other TestResults. - * + * * @skip * @see com.google.gwt.junit.client.impl.JUnitHost * @see com.google.gwt.junit.JUnitMessageQueue @@ -34,27 +34,24 @@ */ public class TestResults implements IsSerializable { - // Computed at the server, via http header - String agent; + // Computed at the server, via HTTP header. + private String agent; - String host; + private String host; /** * The URL of the document on the browser (document.location). This is used to * locate the *cache.html document containing the generated JavaScript for the * test. In the case of hosted mode, this points (uselessly) to the nocache * file, because there is no generated JavaScript. - * + * * Apparently, we can't get this value on the server-side because of the goofy * way HTTP_REFERER is set by different browser implementations of * XMLHttpRequest. */ - String sourceRef; + private String sourceRef; - /** - * @gwt.typeArgs <com.google.gwt.junit.client.Trial> - */ - List<Trial> trials; + private List<Trial> trials; public TestResults() { trials = new ArrayList<Trial>();
diff --git a/user/src/com/google/gwt/junit/client/Trial.java b/user/src/com/google/gwt/junit/client/Trial.java index 230fd28..d30bb3d 100644 --- a/user/src/com/google/gwt/junit/client/Trial.java +++ b/user/src/com/google/gwt/junit/client/Trial.java
@@ -1,12 +1,12 @@ /* - * Copyright 2007 Google Inc. - * + * Copyright 2008 Google Inc. + * * 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 - * + * * http://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 @@ -23,34 +23,35 @@ /** * The result of a single trial-run of a single benchmark method. Each Trial - * contains the results of running a benchmark method with one set of - * values for its parameters. TestResults for a method will contain Trials - * for all permutations of the parameter values. For test methods without - * parameters, there is only 1 trial result. - * + * contains the results of running a benchmark method with one set of values for + * its parameters. TestResults for a method will contain Trials for all + * permutations of the parameter values. For test methods without parameters, + * there is only 1 trial result. + * * @skip */ public class Trial implements IsSerializable { - ExceptionWrapper exceptionWrapper; - - double runTimeMillis; - // Deserialized from exceptionWrapper on the server-side - transient Throwable exception; + private transient Throwable exception; - /** - * @gwt.typeArgs <java.lang.String,java.lang.String> - */ - Map<String, String> variables; + private ExceptionWrapper exceptionWrapper; + + private double runTimeMillis; + + private Map<String, String> variables; + + public Trial() { + this.variables = new HashMap<String, String>(); + } /** * Creates a new Trial. - * - * @param runTimeMillis The amount of time spent executing the test + * + * @param runTimeMillis The amount of time spent executing the test * @param exceptionWrapper The wrapped getException thrown by the the last - * test, or <code>null</code> if the last test - * completed successfully. + * test, or <code>null</code> if the last test completed + * successfully. */ public Trial(Map<String, String> variables, double runTimeMillis, ExceptionWrapper exceptionWrapper) { @@ -59,10 +60,6 @@ this.exceptionWrapper = exceptionWrapper; } - public Trial() { - this.variables = new HashMap<String, String>(); - } - public Throwable getException() { return exception; } @@ -97,7 +94,7 @@ @Override public String toString() { - return "variables: " + variables + ", exceptionWrapper: " + exceptionWrapper - + ", runTimeMillis: " + runTimeMillis; + return "variables: " + variables + ", exceptionWrapper: " + + exceptionWrapper + ", runTimeMillis: " + runTimeMillis; } }