代码整理

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/autoit3/AutoItCmd.java

@@ -1,6 +1,19 @@
-/**
- * http://surenpi.com
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.suren.autotest.web.framework.autoit3;
 
 import java.io.File;
@@ -73,6 +86,11 @@ public void execFileChoose(String title, File file)
 			title = autoItPro.getProperty("dialog.title");
 		}
 
+		if(file == null || !file.isFile())
+		{
+			throw new RuntimeException(String.format("File is null or not a file [%s].", file));
+		}
+		
 		execFileChoose(title, file.getAbsolutePath());
 	}
 
@@ -102,15 +120,15 @@ public void execFileChoose(String title, String filePath)
 
 			logger.debug(String.format("prepare to exec autoit cmd [%s]", cmd));
 
+			Process process = Runtime.getRuntime().exec(cmd);
+			
 			synchronized (this)
 			{
 				isRunning = true;
 
 				notifyAll();
 			}
 
-			Process process = Runtime.getRuntime().exec(cmd);
-			
 			process.waitFor();
 		}
 		catch (IOException | InterruptedException e)
@@ -128,7 +146,9 @@ public void execFileChoose(String title, String filePath)
 	 */
 	private boolean autoItNotExists()
 	{
-		return !(new File(autoitExe).isFile());
+		File autoitExeFile = new File(autoitExe);
+		
+		return !(autoitExeFile.isFile() && autoitExeFile.canExecute());
 	}
 
 	/**

src/main/java/org/suren/autotest/web/framework/core/action/ClickAble.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.action;
 
 import org.suren.autotest.web.framework.core.ui.Element;

src/main/java/org/suren/autotest/web/framework/core/suite/SuiteRunner.java

@@ -1,6 +1,19 @@
-/**
- * http://surenpi.com
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.suren.autotest.web.framework.core.suite;
 
 import java.io.File;

src/main/java/org/suren/autotest/web/framework/core/ui/AbstractElement.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.ui;
 
 import java.util.ArrayList;

src/main/java/org/suren/autotest/web/framework/core/ui/Button.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.ui;
 
 import java.util.ArrayList;

src/main/java/org/suren/autotest/web/framework/core/ui/Element.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.ui;
 
 import java.util.List;

src/main/java/org/suren/autotest/web/framework/core/ui/FileUpload.java

@@ -1,6 +1,19 @@
-/**
- * http://surenpi.com
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.suren.autotest.web.framework.core.ui;
 
 import java.io.File;

src/main/java/org/suren/autotest/web/framework/core/ui/FindElement.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.ui;
 
 /**

src/main/java/org/suren/autotest/web/framework/core/ui/Selector.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.core.ui;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/suren/autotest/web/framework/data/ExcelData.java

@@ -1,6 +1,19 @@
-/**
-* Copyright © 1998-2016, Glodon Inc. All Rights Reserved.
-*/
+/*
+ * Copyright 2002-2007 the original author or 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
+ *
+ *      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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.suren.autotest.web.framework.data;
 
 import org.suren.autotest.web.framework.core.ui.Button;